FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00

History

Michael Niedermayer 5c076205a6 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>

2012-12-08 16:36:47 +01:00

asm.h

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

bswap.h

Merge remote-tracking branch 'qatar/master'

2012-06-25 16:55:31 +02:00

cpu.c

Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'

2012-11-28 13:32:17 +01:00

cpu.h

Merge remote-tracking branch 'qatar/master'