diff options
| author | Xiaolei Yu <dreifachstein@gmail.com> | 2016-09-25 18:56:55 +0800 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-09-25 13:11:45 +0200 |
| commit | 5a70e56f2f116d675b7f97b4c4ad4b8db5771531 (patch) | |
| tree | 82256eb4962cef094b43ad86f849920922afe45c /libavcodec/aarch64 | |
| parent | 267da70ea8c36caaa645a3c4f1c5f0ca8bae156a (diff) | |
| download | ffmpeg-streaming-5a70e56f2f116d675b7f97b4c4ad4b8db5771531.zip ffmpeg-streaming-5a70e56f2f116d675b7f97b4c4ad4b8db5771531.tar.gz | |
avcodec: fix vc1dsp dependencies
Diffstat (limited to 'libavcodec/aarch64')
| -rw-r--r-- | libavcodec/aarch64/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/aarch64/h264cmc_neon.S | 2 |
2 files changed, 2 insertions, 2 deletions
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 |
