File ffmpeg-fix-CONFIG_VC1DSP-changes.patch of Package ffmpeg

From: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Date: 2016-08-29T00:39:13

Upstream shuffled around some options, but missed some occasions.

Some of the code previously enabled by CONFIG_VC1_DECODER now should be enabled
by CONFIG_VC1DSP. The ARM code has not been updated correctly.

The VC1 demuxer adds CONFIG_VC1DSP, but not all dependent code is enabled, leading to linking errors.

---
 libavcodec/aarch64/Makefile       |    2 +-
 libavcodec/aarch64/h264cmc_neon.S |    2 +-
 libavcodec/arm/h264cmc_neon.S     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: ffmpeg-3.1.3/libavcodec/aarch64/Makefile
===================================================================
--- ffmpeg-3.1.3.orig/libavcodec/aarch64/Makefile
+++ ffmpeg-3.1.3/libavcodec/aarch64/Makefile
@@ -14,7 +14,7 @@ OBJS-$(CONFIG_VIDEODSP)
 # 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: ffmpeg-3.1.3/libavcodec/aarch64/h264cmc_neon.S
===================================================================
--- ffmpeg-3.1.3.orig/libavcodec/aarch64/h264cmc_neon.S
+++ ffmpeg-3.1.3/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
Index: ffmpeg-3.1.3/libavcodec/arm/h264cmc_neon.S
===================================================================
--- ffmpeg-3.1.3.orig/libavcodec/arm/h264cmc_neon.S
+++ ffmpeg-3.1.3/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