[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Sun Mar 23 04:05:53 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 23 03:56:43 2014 +0100| [6ee2911996ed5aea8fd49fd264cfb7930a7cd10e] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: drop ff_pixfmt_list_420
Conflicts:
libavcodec/flvdec.c
libavcodec/msmpeg4dec.c
libavcodec/rv10.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ee2911996ed5aea8fd49fd264cfb7930a7cd10e
---
More information about the ffmpeg-cvslog
mailing list