Merge commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730'

* commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730': bfin: dsputil: Unconditionally compile hpel pixels code Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 26f4a50982
parent 866e11b33b a7cc4ac9d9
commit 26f4a50982
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/bfin/Makefile
+++ b/libavcodec/bfin/Makefile
@ -1,9 +1,9 @@
 OBJS += bfin/dsputil_bfin.o                                             \
        bfin/fdct_bfin.o                                                \
+        bfin/hpel_pixels_bfin.o                                         \
        bfin/idct_bfin.o                                                \
        bfin/pixels_bfin.o                                              \

-OBJS-$(CONFIG_HPELDSP)                  += bfin/hpeldsp_bfin.o          \
-                                           bfin/hpel_pixels_bfin.o
+OBJS-$(CONFIG_HPELDSP)                  += bfin/hpeldsp_bfin.o
 OBJS-$(CONFIG_VP3DSP)                   += bfin/vp3_bfin.o              \
                                           bfin/vp3_idct_bfin.o