[FFmpeg-cvslog] Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'
Michael Niedermayer
git at videolan.org
Fri Nov 29 22:43:22 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 22:35:52 2013 +0100| [ad13b8ca9bf5a5cad9cbd4bb36dcd3134d2a2019] | committer: Michael Niedermayer
Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'
* commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72':
mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext
Conflicts:
libavcodec/h263dec.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad13b8ca9bf5a5cad9cbd4bb36dcd3134d2a2019
---
More information about the ffmpeg-cvslog
mailing list