avcodec: fix vc1dsp dependencies
authorXiaolei Yu <dreifachstein@gmail.com>
Sun, 25 Sep 2016 10:56:55 +0000 (18:56 +0800)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Sun, 25 Sep 2016 11:11:45 +0000 (13:11 +0200)
libavcodec/aarch64/Makefile
libavcodec/aarch64/h264cmc_neon.S
libavcodec/arm/h264cmc_neon.S

index 36d9d34..c3df887 100644 (file)
@@ -14,7 +14,7 @@ OBJS-$(CONFIG_VIDEODSP)                 += aarch64/videodsp_init.o
 # decoders/encoders
 OBJS-$(CONFIG_DCA_DECODER)              += aarch64/synth_filter_init.o
 OBJS-$(CONFIG_RV40_DECODER)             += aarch64/rv40dsp_init_aarch64.o
-OBJS-$(CONFIG_VC1_DECODER)              += aarch64/vc1dsp_init_aarch64.o
+OBJS-$(CONFIG_VC1DSP)                   += aarch64/vc1dsp_init_aarch64.o
 OBJS-$(CONFIG_VORBIS_DECODER)           += aarch64/vorbisdsp_init.o
 
 # ARMv8 optimizations
index 486079f..ff97a29 100644 (file)
@@ -445,7 +445,7 @@ endconst
         h264_chroma_mc4 avg, rv40
 #endif
 
-#if CONFIG_VC1_DECODER
+#if CONFIG_VC1DSP
         h264_chroma_mc8 put, vc1
         h264_chroma_mc8 avg, vc1
         h264_chroma_mc4 put, vc1
index 77ed3c0..fc48a6f 100644 (file)
@@ -455,7 +455,7 @@ endconst
         h264_chroma_mc4 avg, rv40
 #endif
 
-#if CONFIG_VC1_DECODER
+#if CONFIG_VC1DSP
         h264_chroma_mc8 put, vc1
         h264_chroma_mc8 avg, vc1
         h264_chroma_mc4 put, vc1