1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Michael Niedermayer 624327988f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doc: Completely document the x264 options

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 04:54:26 +02:00
..