[FFmpeg-cvslog] Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'
Michael Niedermayer
git at videolan.org
Fri Dec 6 01:45:52 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 6 01:38:55 2013 +0100| [36e2ec40688d0c3c350d31fae00a54f6a23b7647] | committer: Michael Niedermayer
Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'
* commit 'f7d228676cb7669059889c4225c8a8dc56708c24':
mpeg4videodec: move intra_dc_threshold 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=36e2ec40688d0c3c350d31fae00a54f6a23b7647
---
More information about the ffmpeg-cvslog
mailing list