Merge commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 20:36:05 +0000 (22:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 20:36:12 +0000 (22:36 +0200)
* commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6':
  doc: document the prores encoder options

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/encoders.texi

Simple merge