[FFmpeg-cvslog] Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'
Michael Niedermayer
git at videolan.org
Fri Dec 6 01:22:23 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 6 01:14:46 2013 +0100| [92e10e34b1422423715bbfadfcd19b045f63dbcc] | committer: Michael Niedermayer
Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'
* commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2':
mpeg4videodec: move use_intra_dc_vlc 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=92e10e34b1422423715bbfadfcd19b045f63dbcc
---
More information about the ffmpeg-cvslog
mailing list