ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Feb 23 12:03:29 2015 +0100| [2cf521718d9427329b9324b00fb59caddcf42782] | committer: Michael Niedermayer
Merge commit '35c6ce76b107225a19eb33aea38857d2405882af' * commit '35c6ce76b107225a19eb33aea38857d2405882af': Canopus HQX decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cf521718d9427329b9324b00fb59caddcf42782 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog