[FFmpeg-cvslog] Merge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc'
Michael Niedermayer
git at videolan.org
Sat Nov 30 02:29:30 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 30 02:25:51 2013 +0100| [2b1922d9641012a01eee144a4410f5e94ccfbec7] | committer: Michael Niedermayer
Merge commit 'b452d5ae866942cec00aa1432fe29498b38b49fc'
* commit 'b452d5ae866942cec00aa1432fe29498b38b49fc':
mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4
Conflicts:
libavcodec/h263dec.c
not merged, the header decode function is not the right place
See: 6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b1922d9641012a01eee144a4410f5e94ccfbec7
---
More information about the ffmpeg-cvslog
mailing list