1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Michael Niedermayer 6dc9d2cf47 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>
2014-01-30 16:00:47 +01:00
..
2014-01-20 13:10:10 +01:00
2014-01-27 15:18:18 +01:00