[FFmpeg-cvslog] Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'
Michael Niedermayer
git at videolan.org
Fri Nov 29 22:33:56 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 22:27:28 2013 +0100| [be0b869b04c049ea00fd178bb4c4fe4b767ed31d] | committer: Michael Niedermayer
Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'
* commit '35e0833d410e31d9fd35695ad798c5d13de2af58':
mpeg4videodec: add a mpeg4-specific private context.
Conflicts:
libavcodec/mpeg4video_parser.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be0b869b04c049ea00fd178bb4c4fe4b767ed31d
---
More information about the ffmpeg-cvslog
mailing list