Merge commit '15a24614aef5836af3cd2c7cc3b2b737eee6bf3c'

* commit '15a24614aef5836af3cd2c7cc3b2b737eee6bf3c':
  build: Add vc1dsp component for more fine-grained dependencies

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc configure
index 8a769e1ed05a9c27d18918cc4d78ad127929b6e2,091260020b1658427cc398085babcc0ad22123ac..ed5c92850859a666eb7b4a21a21aed33e73f43c1
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2233,11 -1867,13 +2234,12 @@@ me_cmp_select="fdctdsp idctdsp pixblock
  mpeg_er_select="error_resilience"
  mpegaudio_select="mpegaudiodsp"
  mpegaudiodsp_select="dct"
 -mpegvideo_select="blockdsp hpeldsp idctdsp me_cmp mpeg_er videodsp"
 +mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp mpeg_er videodsp"
  mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"
 -nvenc_deps_any="dlopen LoadLibrary"
 -nvenc_extralibs='$ldl'
  qsvdec_select="qsv"
  qsvenc_select="qsv"
+ vc1dsp_select="h264chroma qpeldsp startcode"
 +rdft_select="fft"
  
  # decoders / encoders
  aac_decoder_select="imdct15 mdct sinewin"
@@@ -2438,9 -2062,7 +2440,9 @@@ txd_decoder_select="texturedsp
  utvideo_decoder_select="bswapdsp"
  utvideo_encoder_select="bswapdsp huffman huffyuvencdsp"
  vble_decoder_select="huffyuvdsp"
- vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideo qpeldsp startcode"
 -vc1_decoder_select="blockdsp error_resilience h263_decoder h264qpel intrax8 mpeg_er mpegvideo vc1dsp"
++vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideo"
 +vc1_qsv_decoder_deps="libmfx"
 +vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel"
  vc1image_decoder_select="vc1_decoder"
  vorbis_decoder_select="mdct"
  vorbis_encoder_select="mdct"

diff --cc libavcodec/Makefile
index 65295a889bae81c05ec9e7ef0771b757bc59181e,cf81b4a1768c53e96b4468902de304332039f555..c55ecdd7724a34949700c63ac924e9b747c58d1b
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -538,12 -444,8 +539,11 @@@ OBJS-$(CONFIG_VB_DECODER)              
  OBJS-$(CONFIG_VBLE_DECODER)            += vble.o
  OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1_block.o vc1_loopfilter.o \
                                            vc1_mc.o vc1_pred.o vc1.o vc1data.o \
-                                           vc1dsp.o \
                                            msmpeg4dec.o msmpeg4.o msmpeg4data.o \
 -                                          wmv2data.o
 +                                          wmv2dsp.o wmv2data.o
 +OBJS-$(CONFIG_VC1_MMAL_DECODER)        += mmaldec.o
 +OBJS-$(CONFIG_VC1_QSV_DECODER)         += qsvdec_vc1.o
 +OBJS-$(CONFIG_VC2_ENCODER)             += vc2enc.o vc2enc_dwt.o diractab.o
  OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
  OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdaudio.o
  OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdvideo.o

diff --cc libavcodec/arm/Makefile
index 179c403bc1dc775e434e10d259d0180a3e567afb,14d3f495eb27b568abfc3bc744d4c369da3ce69b..50230cc4af1793b6b68fa3900384bac20978ccc9
--- 1/libavcodec/arm/Makefile
--- 2/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@@ -36,11 -36,10 +37,10 @@@ OBJS-$(CONFIG_VP8DSP)                  
  # decoders/encoders
  OBJS-$(CONFIG_AAC_DECODER)             += arm/aacpsdsp_init_arm.o       \
                                            arm/sbrdsp_init_arm.o
 -OBJS-$(CONFIG_APE_DECODER)             += arm/apedsp_init_arm.o
 -OBJS-$(CONFIG_DCA_DECODER)             += arm/dcadsp_init_arm.o
 +OBJS-$(CONFIG_DCA_DECODER)             += arm/synth_filter_init_arm.o
 +OBJS-$(CONFIG_HEVC_DECODER)            += arm/hevcdsp_init_arm.o
  OBJS-$(CONFIG_MLP_DECODER)             += arm/mlpdsp_init_arm.o
  OBJS-$(CONFIG_RV40_DECODER)            += arm/rv40dsp_init_arm.o
- OBJS-$(CONFIG_VC1_DECODER)             += arm/vc1dsp_init_arm.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += arm/vorbisdsp_init_arm.o
  OBJS-$(CONFIG_VP6_DECODER)             += arm/vp6dsp_init_arm.o
  

diff --cc libavcodec/ppc/Makefile
index bd4f427895a36fe0aff9ca801a9bdd9e69c957b0,2b6c81be27aa04c748de7005c379db5ffee39229..290534bc8e97714bdefe83270a09e28fe5706aa9
--- 1/libavcodec/ppc/Makefile
--- 2/libavcodec/ppc/Makefile
+++ b/libavcodec/ppc/Makefile
@@@ -23,8 -23,7 +24,7 @@@ OBJS-$(CONFIG_VP3DSP)                  
  OBJS-$(CONFIG_VP8DSP)                  += ppc/vp8dsp_altivec.o
  
  # decoders/encoders
 -OBJS-$(CONFIG_APE_DECODER)             += ppc/apedsp_altivec.o
 +OBJS-$(CONFIG_LLAUDDSP)                += ppc/lossless_audiodsp_altivec.o
  OBJS-$(CONFIG_SVQ1_ENCODER)            += ppc/svq1enc_altivec.o
- OBJS-$(CONFIG_VC1_DECODER)             += ppc/vc1dsp_altivec.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += ppc/vorbisdsp_altivec.o
  OBJS-$(CONFIG_VP7_DECODER)             += ppc/vp8dsp_altivec.o

diff --cc libavcodec/x86/Makefile
index 668a9befd90686527462bbcd42464f80ff319714,8ae128314109b5ccd2855757066683b7c2be9a08..629b0eefa5533f12037179b07cf727bf87fdc870
--- 1/libavcodec/x86/Makefile
--- 2/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@@ -54,33 -45,29 +55,32 @@@ OBJS-$(CONFIG_MLP_DECODER)             
  OBJS-$(CONFIG_MPEG4_DECODER)           += x86/xvididct_init.o
  OBJS-$(CONFIG_PNG_DECODER)             += x86/pngdsp_init.o
  OBJS-$(CONFIG_PRORES_DECODER)          += x86/proresdsp_init.o
 +OBJS-$(CONFIG_PRORES_LGPL_DECODER)     += x86/proresdsp_init.o
  OBJS-$(CONFIG_RV40_DECODER)            += x86/rv40dsp_init.o
 -OBJS-$(CONFIG_SVQ1_ENCODER)            += x86/svq1enc.o
 -OBJS-$(CONFIG_TRUEHD_DECODER)          += x86/mlpdsp.o
 +OBJS-$(CONFIG_SVQ1_ENCODER)            += x86/svq1enc_init.o
 +OBJS-$(CONFIG_TAK_DECODER)             += x86/takdsp_init.o
 +OBJS-$(CONFIG_TRUEHD_DECODER)          += x86/mlpdsp_init.o
 +OBJS-$(CONFIG_TTA_DECODER)             += x86/ttadsp_init.o
 +OBJS-$(CONFIG_V210_DECODER)            += x86/v210-init.o
  OBJS-$(CONFIG_V210_ENCODER)            += x86/v210enc_init.o
- OBJS-$(CONFIG_VC1_DECODER)             += x86/vc1dsp_init.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += x86/vorbisdsp_init.o
  OBJS-$(CONFIG_VP6_DECODER)             += x86/vp6dsp_init.o
 -OBJS-$(CONFIG_VP9_DECODER)             += x86/vp9dsp_init.o
 +OBJS-$(CONFIG_VP9_DECODER)             += x86/vp9dsp_init.o            \
 +                                          x86/vp9dsp_init_10bpp.o      \
 +                                          x86/vp9dsp_init_12bpp.o      \
 +                                          x86/vp9dsp_init_16bpp.o
 +OBJS-$(CONFIG_WEBP_DECODER)            += x86/vp8dsp_init.o
  
  
  # GCC inline assembly optimizations
  # subsystems
 -MMX-OBJS-$(CONFIG_AUDIODSP)            += x86/audiodsp_mmx.o
 -MMX-OBJS-$(CONFIG_HPELDSP)             += x86/fpel_mmx.o                \
 -                                          x86/hpeldsp_mmx.o
  MMX-OBJS-$(CONFIG_FDCTDSP)             += x86/fdct.o
 -MMX-OBJS-$(CONFIG_IDCTDSP)             += x86/idctdsp_mmx.o             \
 -                                          x86/simple_idct.o
 -MMX-OBJS-$(CONFIG_QPELDSP)             += x86/fpel_mmx.o
 +MMX-OBJS-$(CONFIG_IDCTDSP)             += x86/simple_idct.o
+ MMX-OBJS-$(CONFIG_VC1DSP)              += x86/vc1dsp_mmx.o
  
  # decoders/encoders
 -MMX-OBJS-$(CONFIG_MPEG4_DECODER)       += x86/xvididct_mmx.o            \
 -                                          x86/xvididct_sse2.o
 +MMX-OBJS-$(CONFIG_SNOW_DECODER)        += x86/snowdsp.o
 +MMX-OBJS-$(CONFIG_SNOW_ENCODER)        += x86/snowdsp.o
- MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o
  
  # subsystems
  YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
@@@ -120,55 -102,23 +120,55 @@@ YASM-OBJS-$(CONFIG_QPELDSP)            
                                            x86/fpel.o                    \
                                            x86/qpel.o
  YASM-OBJS-$(CONFIG_RV34DSP)            += x86/rv34dsp.o
+ YASM-OBJS-$(CONFIG_VC1DSP)             += x86/vc1dsp.o
 +YASM-OBJS-$(CONFIG_IDCTDSP)            += x86/simple_idct10.o
  YASM-OBJS-$(CONFIG_VIDEODSP)           += x86/videodsp.o
  YASM-OBJS-$(CONFIG_VP3DSP)             += x86/vp3dsp.o
  YASM-OBJS-$(CONFIG_VP8DSP)             += x86/vp8dsp.o                  \
                                            x86/vp8dsp_loopfilter.o
  
  # decoders/encoders
 -YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
 -YASM-OBJS-$(CONFIG_APE_DECODER)        += x86/apedsp.o
 -YASM-OBJS-$(CONFIG_DCA_DECODER)        += x86/dcadsp.o
 +YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/aacpsdsp.o                \
 +                                          x86/sbrdsp.o
 +YASM-OBJS-$(CONFIG_ADPCM_G722_DECODER) += x86/g722dsp.o
 +YASM-OBJS-$(CONFIG_ADPCM_G722_ENCODER) += x86/g722dsp.o
 +YASM-OBJS-$(CONFIG_ALAC_DECODER)       += x86/alacdsp.o
 +YASM-OBJS-$(CONFIG_APNG_DECODER)       += x86/pngdsp.o
 +YASM-OBJS-$(CONFIG_DCA_DECODER)        += x86/dcadsp.o x86/synth_filter.o
 +YASM-OBJS-$(CONFIG_DIRAC_DECODER)      += x86/diracdsp.o                \
 +                                          x86/dirac_dwt.o
  YASM-OBJS-$(CONFIG_DNXHD_ENCODER)      += x86/dnxhdenc.o
 -YASM-OBJS-$(CONFIG_HEVC_DECODER)       += x86/hevc_deblock.o            \
 -                                          x86/hevc_mc.o
 +YASM-OBJS-$(CONFIG_FLAC_DECODER)       += x86/flacdsp.o
 +ifdef CONFIG_GPL
 +YASM-OBJS-$(CONFIG_FLAC_ENCODER)       += x86/flac_dsp_gpl.o
 +endif
 +YASM-OBJS-$(CONFIG_HEVC_DECODER)       += x86/hevc_mc.o                 \
 +                                          x86/hevc_deblock.o            \
 +                                          x86/hevc_idct.o               \
 +                                          x86/hevc_res_add.o            \
 +                                          x86/hevc_sao.o                \
 +                                          x86/hevc_sao_10bit.o
 +YASM-OBJS-$(CONFIG_JPEG2000_DECODER)   += x86/jpeg2000dsp.o
 +YASM-OBJS-$(CONFIG_MLP_DECODER)        += x86/mlpdsp.o
 +YASM-OBJS-$(CONFIG_MPEG4_DECODER)      += x86/xvididct.o
  YASM-OBJS-$(CONFIG_PNG_DECODER)        += x86/pngdsp.o
  YASM-OBJS-$(CONFIG_PRORES_DECODER)     += x86/proresdsp.o
 +YASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
  YASM-OBJS-$(CONFIG_RV40_DECODER)       += x86/rv40dsp.o
 +YASM-OBJS-$(CONFIG_SVQ1_ENCODER)       += x86/svq1enc.o
 +YASM-OBJS-$(CONFIG_TAK_DECODER)        += x86/takdsp.o
 +YASM-OBJS-$(CONFIG_TRUEHD_DECODER)     += x86/mlpdsp.o
 +YASM-OBJS-$(CONFIG_TTA_DECODER)        += x86/ttadsp.o
  YASM-OBJS-$(CONFIG_V210_ENCODER)       += x86/v210enc.o
- YASM-OBJS-$(CONFIG_VC1_DECODER)        += x86/vc1dsp.o
 +YASM-OBJS-$(CONFIG_V210_DECODER)       += x86/v210.o
  YASM-OBJS-$(CONFIG_VORBIS_DECODER)     += x86/vorbisdsp.o
  YASM-OBJS-$(CONFIG_VP6_DECODER)        += x86/vp6dsp.o
 -YASM-OBJS-$(CONFIG_VP9_DECODER)        += x86/vp9dsp.o
 +YASM-OBJS-$(CONFIG_VP9_DECODER)        += x86/vp9intrapred.o            \
 +                                          x86/vp9intrapred_16bpp.o      \
 +                                          x86/vp9itxfm.o                \
 +                                          x86/vp9itxfm_16bpp.o          \
 +                                          x86/vp9lpf.o                  \
 +                                          x86/vp9lpf_16bpp.o            \
 +                                          x86/vp9mc.o                   \
 +                                          x86/vp9mc_16bpp.o
 +YASM-OBJS-$(CONFIG_WEBP_DECODER)       += x86/vp8dsp.o