Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Dec 2012 15:36:47 +0000 (16:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Dec 2012 15:36:47 +0000 (16:36 +0100)
commit5c076205a67d44c9e28ce5a74b55d281d1a3c106
tree56824e88a7c7a208864a04ec3a4659d5e7fd1bcb
parent1a4250493b3aae4ca366092fb0922e7c098f478c
parent9a2e79116d6235c53d8e9663a8d30d1950d7431a
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@gmx.at>
libavcodec/golomb.h
libavcodec/rv30.c
libavcodec/svq3.c
libavutil/x86/float_dsp.asm