[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Thu Jan 30 16:27:11 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 30 16:00:47 2014 +0100| [6dc9d2cf4741203aeac479e8dc1ebe021abf9006] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: document correct option to list encoders
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6dc9d2cf4741203aeac479e8dc1ebe021abf9006
---
More information about the ffmpeg-cvslog
mailing list