[FFmpeg-cvslog] Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'
Michael Niedermayer
git at videolan.org
Sat Nov 30 02:50:03 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 30 02:42:56 2013 +0100| [ec5499d8bac82007bfc966fb1a7b8233375723cf] | committer: Michael Niedermayer
Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'
* commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb':
mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec
Conflicts:
libavcodec/h263dec.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec5499d8bac82007bfc966fb1a7b8233375723cf
---
More information about the ffmpeg-cvslog
mailing list