Michael Niedermayer eadba3e94d Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f' ... * commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f': adxdec: use planar sample format adpcmdec: use planar sample format for adpcm_thp adpcmdec: use planar sample format for adpcm_ea_xas adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3 adpcmdec: use planar sample format for adpcm_xa adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3 adpcmdec: use planar sample format for adpcm_4xm adpcmdec: use planar sample format for adpcm_ima_wav adpcmdec: use planar sample format for adpcm_ima_qt pcmdec: use planar sample format for pcm_lxf mace: use planar sample format atrac1: use planar sample format build: non-x86: Only compile mpegvideo optimizations when necessary rtpdec_mpeg4: au_headers is a single array, simple av_free is enough avcodec: free extended_data instead address of it fate: Add tests of the ff_make_absolute_url function url: Handle relative urls starting with two slashes url: Handle relative urls being just a new query string url: Don't treat slashes in query parameters as directory separators Conflicts: libavcodec/adxdec.c libavcodec/mips/Makefile libavcodec/pcm.c libavcodec/utils.c libavformat/Makefile libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-10 13:01:27 +02:00
..
acelp_filters_mips.c	replace all __volatile__ by volatile	2012-07-11 04:04:29 +02:00
acelp_vectors_mips.c	replace all __volatile__ by volatile	2012-07-11 04:04:29 +02:00
amrwbdec_mips.c	replace all __volatile__ by volatile	2012-07-11 04:04:29 +02:00
amrwbdec_mips.h
celp_filters_mips.c	replace all __volatile__ by volatile	2012-07-11 04:04:29 +02:00
celp_math_mips.c	replace all __volatile__ by volatile	2012-07-11 04:04:29 +02:00
compute_antialias_fixed.h	replace all __volatile__ by volatile	2012-07-11 04:04:29 +02:00
compute_antialias_float.h	replace all __volatile__ by volatile	2012-07-11 04:04:29 +02:00
dsputil_mips.c	Optimization of AC3 floating point decoder for MIPS	2012-09-05 20:09:56 +02:00
dsputil_mmi.c
fft_init_table.c	Optimization of AC3 floating point decoder for MIPS	2012-09-05 20:09:56 +02:00
fft_mips.c	Optimization of AC3 floating point decoder for MIPS	2012-09-05 20:09:56 +02:00
fft_table.h	Optimization of AC3 floating point decoder for MIPS	2012-09-05 20:09:56 +02:00
fmtconvert_mips.c	Optimization of AC3 floating point decoder for MIPS	2012-09-05 20:09:56 +02:00
idct_mmi.c
lsp_mips.h	replace all __volatile__ by volatile	2012-07-11 04:04:29 +02:00
Makefile	Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'	2012-10-10 13:01:27 +02:00
mathops.h
mmi.h
mpegaudiodsp_mips_fixed.c	replace all __volatile__ by volatile	2012-07-11 04:04:29 +02:00
mpegaudiodsp_mips_float.c	replace all __volatile__ by volatile	2012-07-11 04:04:29 +02:00
mpegvideo_mmi.c