Michael Niedermayer 85fe70b64c Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' ...

* commit 'ca411fc1d34329cd17b28627f697e391ae52073f':
  avcodec: Remove broken MMI optimizations

Conflicts:
	arch.mak
	configure
	libavcodec/avcodec.h
	libavcodec/mips/Makefile
	libavcodec/mips/dsputil_mmi.c
	libavcodec/mips/idct_mmi.c
	libavcodec/mips/mmi.h
	libavcodec/mips/mpegvideo_mmi.c
	libavcodec/options_table.h

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

2012-10-13 15:25:11 +02:00

..

acelp_filters_mips.c

…

acelp_vectors_mips.c

…

amrwbdec_mips.c

…

amrwbdec_mips.h

…

celp_filters_mips.c

…

celp_math_mips.c

…

compute_antialias_fixed.h

…

compute_antialias_float.h

…

dsputil_mips.c

…

fft_init_table.c

…

fft_mips.c

…

fft_table.h

…

fmtconvert_mips.c

…

lsp_mips.h

…

Makefile

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

2012-10-13 15:25:11 +02:00

mathops.h

…

mpegaudiodsp_mips_fixed.c

…

mpegaudiodsp_mips_float.c

…