[FFmpeg-cvslog] Merge commit '9e0f14f16cfc9456a691655fda7d01090bffe47e'
Michael Niedermayer
git at videolan.org
Mon Apr 8 12:52:47 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 8 12:47:49 2013 +0200| [024a5f72eec54b9a3fcaa6fc568ae1e21ac0a6a6] | committer: Michael Niedermayer
Merge commit '9e0f14f16cfc9456a691655fda7d01090bffe47e'
* commit '9e0f14f16cfc9456a691655fda7d01090bffe47e':
lavc: Make pointers to ff_cropTbl const
vp3: Embed idct_permutation array directly in VP3DecoderContext
Conflicts:
libavcodec/bit_depth_template.c
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=024a5f72eec54b9a3fcaa6fc568ae1e21ac0a6a6
---
More information about the ffmpeg-cvslog
mailing list