diff mbox

[FFmpeg-devel,v2] avcodec: fix vc1dsp dependencies

Message ID 0d06b7f5-47ba-fbd5-9005-4690b54d916b@gmail.com
State Accepted
Commit 5a70e56f2f116d675b7f97b4c4ad4b8db5771531
Headers show

Commit Message

Xiaolei Yu Sept. 25, 2016, 10:56 a.m. UTC 
---
 libavcodec/aarch64/Makefile       | 2 +-
 libavcodec/aarch64/h264cmc_neon.S | 2 +-
 libavcodec/arm/h264cmc_neon.S     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Carl Eugen Hoyos Sept. 25, 2016, 11:12 a.m. UTC | #1 
[...]

Patch applied.

Thank you, Carl Eugen
diff mbox

Patch

diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile
index 36d9d34..c3df887 100644
--- a/libavcodec/aarch64/Makefile
+++ b/libavcodec/aarch64/Makefile
@@ -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
diff --git a/libavcodec/aarch64/h264cmc_neon.S b/libavcodec/aarch64/h264cmc_neon.S
index 486079f..ff97a29 100644
--- a/libavcodec/aarch64/h264cmc_neon.S
+++ b/libavcodec/aarch64/h264cmc_neon.S
@@ -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
diff --git a/libavcodec/arm/h264cmc_neon.S b/libavcodec/arm/h264cmc_neon.S
index 77ed3c0..fc48a6f 100644
--- a/libavcodec/arm/h264cmc_neon.S
+++ b/libavcodec/arm/h264cmc_neon.S
@@ -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