Michael Niedermayer 24604ebaf8 Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3' ...

* commit '5959bfaca396ecaf63a8123055f499688b79cae3':
  floatdsp: move butterflies_float from dsputil to avfloatdsp.

Conflicts:
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/imc.c
	libavcodec/mpegaudiodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-01-23 14:13:54 +01:00

..

asm.S

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

bswap.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

2012-12-08 14:19:55 +01:00

cpu.c

arm: detect cpu features at runtime on Linux

2012-12-07 16:54:04 +00:00

cpu.h

arm: rename ARMVFP config symbol to VFP

2012-12-07 16:54:04 +00:00

float_dsp_arm.h

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

float_dsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-06-22 22:34:02 +02:00

float_dsp_init_neon.c

floatdsp: move butterflies_float from dsputil to avfloatdsp.

2013-01-22 11:55:42 -08:00

float_dsp_init_vfp.c

Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'

2013-01-23 14:04:50 +01:00

float_dsp_neon.S

floatdsp: move butterflies_float from dsputil to avfloatdsp.

2013-01-22 11:55:42 -08:00

float_dsp_vfp.S

Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'

2013-01-23 14:04:50 +01:00

intmath.h

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

2012-12-08 14:19:55 +01:00

intreadwrite.h

Merge remote-tracking branch 'qatar/master'

2012-08-09 00:51:02 +02:00

Makefile

arm: rename ARMVFP config symbol to VFP

2012-12-07 16:54:04 +00:00

timer.h

…