[FFmpeg-cvslog] Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'
Michael Niedermayer
git at videolan.org
Sat Nov 30 03:08:38 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 30 02:52:09 2013 +0100| [b4ef7447eb16fc947110d86ebb4593066e524ae1] | committer: Michael Niedermayer
Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'
* commit '43af264de8606668c6b2fa7f96c946bdc3dbe072':
mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4ef7447eb16fc947110d86ebb4593066e524ae1
---
More information about the ffmpeg-cvslog
mailing list