eadba3e94d
* 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>
21 lines
1.3 KiB
Makefile
21 lines
1.3 KiB
Makefile
MMI-OBJS += mips/dsputil_mmi.o \
|
|
mips/idct_mmi.o \
|
|
|
|
MMI-OBJS-$(CONFIG_MPEGVIDEO) += mips/mpegvideo_mmi.o
|
|
|
|
MIPSFPU-OBJS-$(CONFIG_AMRNB_DECODER) += mips/acelp_filters_mips.o \
|
|
mips/celp_filters_mips.o \
|
|
mips/celp_math_mips.o \
|
|
mips/acelp_vectors_mips.o
|
|
MIPSFPU-OBJS-$(CONFIG_AMRWB_DECODER) += mips/acelp_filters_mips.o \
|
|
mips/celp_filters_mips.o \
|
|
mips/amrwbdec_mips.o \
|
|
mips/celp_math_mips.o \
|
|
mips/acelp_vectors_mips.o
|
|
MIPSFPU-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_float.o
|
|
MIPSDSPR1-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_fixed.o
|
|
OBJS-$(CONFIG_FFT) += mips/fft_init_table.o
|
|
MIPSFPU-OBJS-$(CONFIG_FFT) += mips/fft_mips.o
|
|
MIPSFPU-OBJS-$(HAVE_INLINE_ASM) += mips/fmtconvert_mips.o
|
|
MIPSFPU-OBJS-$(HAVE_INLINE_ASM) += mips/dsputil_mips.o
|