[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Sat Dec 8 16:40:08 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 8 16:36:47 2012 +0100| [5c076205a67d44c9e28ce5a74b55d281d1a3c106] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
golomb: use unsigned arithmetics in svq3_get_ue_golomb()
x86: float_dsp: fix loading of the len parameter on x86-32
takdec: fix initialisation of LOCAL_ALIGNED array
takdec: fix initialisation of LOCAL_ALIGNED array
Conflicts:
libavcodec/rv30.c
libavcodec/svq3.c
libavcodec/takdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c076205a67d44c9e28ce5a74b55d281d1a3c106
---
More information about the ffmpeg-cvslog
mailing list