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)
commit97104aa011da3a22bc445bdd0630a03c9fd5760b
tree660c93b73021f8e8450f62c4580e74efae0f407c
parentb2175b0f2a7cfdcc784ec2eabab4f6da3b0e6979
parentf223ad1e000d56ef5231a3b1fc00495b538a9ed6
Merge commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6'

* commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6':
  doc: document the prores encoder options

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