-
Michael Niedermayer authored
* qatar/master: doc: document correct option to list encoders Conflicts: doc/encoders.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
6dc9d2cf
* qatar/master:
doc: document correct option to list encoders
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>