aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-02 01:51:44 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-02 01:54:27 +0200
commit4defa68fe25eae4d7c27341e3b35811c047dcd3f (patch)
tree9d4d37343ec4c99801c1b76b813b0a5b2b04576b /libavcodec/arm/Makefile
parenta2f5e14a867768019b49b830e29801f1bfb2abb7 (diff)
parentaa05f2126e18d23432bde77e6f44e41691472fef (diff)
downloadffmpeg-4defa68fe25eae4d7c27341e3b35811c047dcd3f.tar.gz
Merge remote branch 'qatar/master'
* qatar/master: ac3enc: ARM optimised ac3_compute_matissa_size ac3: armv6 optimised bit_alloc_calc_bap fate: simplify fft test rules avio: document avio_alloc_context. lavf: make compute_chapters_end less picky. sierravmd: fix Indeo3 videos FFT: simplify fft8() fate: add fixed-point fft/mdct tests Fixed-point support in fft-test ape: check that number of seektable entries is equal to number of frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/Makefile')
-rw-r--r--libavcodec/arm/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index 08697da29b..3b77a5548d 100644
--- a/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@ -1,6 +1,10 @@
-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o
+OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o \
+ arm/ac3dsp_arm.o
+
OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o \
+ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o
+
OBJS-$(CONFIG_VP5_DECODER) += arm/vp56dsp_init_arm.o
OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_init_arm.o
OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_init_arm.o