[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Fri Mar 14 19:46:51 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 19:36:46 2014 +0100| [a8a84fa8b2cdeea11bb6bc0efbd81d5520a02b5e] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
codec_desc: group image codecs together
Conflicts:
libavcodec/codec_desc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8a84fa8b2cdeea11bb6bc0efbd81d5520a02b5e
---
More information about the ffmpeg-cvslog
mailing list