Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Jan 2014 15:00:47 +0000 (16:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Jan 2014 15:00:47 +0000 (16:00 +0100)
commit6dc9d2cf4741203aeac479e8dc1ebe021abf9006
tree588cd17856d2c2ca7f17aa3fbffff73400a096ec
parentd85284d4aa7d388f33bd8a418df3a3cbe349cd39
parent64ba831da99c5526b21d510397b449742e92961e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: document correct option to list encoders

Conflicts:
doc/encoders.texi

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