[FFmpeg-cvslog] Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'
Michael Niedermayer
git at videolan.org
Sat Nov 30 03:20:46 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 30 03:11:16 2013 +0100| [3e5cd34cd01f889a841ae850bf7776b9e33082e9] | committer: Michael Niedermayer
Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'
* commit '038890740014dc33d2e2f04da7cf0a9da821264e':
mpeg4videodec: move cplx_estimation_* fields 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=3e5cd34cd01f889a841ae850bf7776b9e33082e9
---
More information about the ffmpeg-cvslog
mailing list