summaryrefslogtreecommitdiff
path: root/libavcodec/bfin
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-20 22:12:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-20 22:12:11 +0100
commit3775224b2f8a9c2c0bf5d53272236d4a1ffb0875 (patch)
tree2125e454ac53d8e5e01f3b70e28206308e8a2197 /libavcodec/bfin
parentba85bfabf3a1b762b3e07f53d404f4c7c4e1703a (diff)
parent54a6e08a650a71fd375551585b0ea40a3a06d228 (diff)
Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'
* commit '54a6e08a650a71fd375551585b0ea40a3a06d228': dsputil: Conditionally compile dsputil code on all architectures Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bfin')
-rw-r--r--libavcodec/bfin/Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/bfin/Makefile b/libavcodec/bfin/Makefile
index 193f8e6700..efdcbfc69f 100644
--- a/libavcodec/bfin/Makefile
+++ b/libavcodec/bfin/Makefile
@@ -1,10 +1,10 @@
-OBJS += bfin/dsputil_init.o \
- bfin/dsputil.o \
- bfin/fdct_bfin.o \
- bfin/hpel_pixels_no_rnd.o \
- bfin/idct_bfin.o \
- bfin/pixels.o \
-
-OBJS-$(CONFIG_HPELDSP) += bfin/hpeldsp_init.o
+OBJS-$(CONFIG_DSPUTIL) += bfin/dsputil_init.o \
+ bfin/dsputil.o \
+ bfin/fdct_bfin.o \
+ bfin/idct_bfin.o \
+ bfin/pixels.o
+OBJS-$(CONFIG_HPELDSP) += bfin/hpeldsp_init.o \
+ bfin/hpel_pixels_no_rnd.o \
+ bfin/pixels.o
OBJS-$(CONFIG_VP3DSP) += bfin/vp3dsp_init.o \
bfin/vp3dsp.o