Merge commit 'a623aa0069dff586241ad2ffedcd45ed840e2553'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 20:56:00 +0000 (22:56 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 20:56:00 +0000 (22:56 +0200)
* commit 'a623aa0069dff586241ad2ffedcd45ed840e2553':
  configure: Factor out wmv2dsp module

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
configure
libavcodec/Makefile

diff --cc configure
+++ b/configure
@@@ -2352,18 -1997,17 +2353,18 @@@ wmav2_encoder_select="mdct sinewin wma_
  wmavoice_decoder_select="lsp rdft dct mdct sinewin"
  wmv1_decoder_select="h263_decoder"
  wmv1_encoder_select="h263_encoder"
- wmv2_decoder_select="blockdsp h263_decoder idctdsp intrax8 videodsp"
- wmv2_encoder_select="h263_encoder"
+ wmv2_decoder_select="blockdsp h263_decoder idctdsp intrax8 videodsp wmv2dsp"
+ wmv2_encoder_select="h263_encoder wmv2dsp"
  wmv3_decoder_select="vc1_decoder"
  wmv3image_decoder_select="wmv3_decoder"
 -zerocodec_decoder_deps="zlib"
 -zlib_decoder_deps="zlib"
 -zlib_encoder_deps="zlib"
 -zmbv_decoder_deps="zlib"
 -zmbv_encoder_deps="zlib"
 +zerocodec_decoder_select="zlib"
 +zlib_decoder_select="zlib"
 +zlib_encoder_select="zlib"
 +zmbv_decoder_select="zlib"
 +zmbv_encoder_select="zlib"
  
  # hardware accelerators
 +crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
  d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder"
  dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode"
  vaapi_deps="va_va_h"
@@@ -117,9 -105,9 +117,10 @@@ OBJS-$(CONFIG_VP3DSP)                  
  OBJS-$(CONFIG_VP56DSP)                 += vp56dsp.o
  OBJS-$(CONFIG_VP8DSP)                  += vp8dsp.o
  OBJS-$(CONFIG_WMA_FREQS)               += wma_freqs.o
+ OBJS-$(CONFIG_WMV2DSP)                 += wmv2dsp.o
  
  # decoders/encoders
 +OBJS-$(CONFIG_ZERO12V_DECODER)         += 012v.o
  OBJS-$(CONFIG_A64MULTI_ENCODER)        += a64multienc.o elbg.o
  OBJS-$(CONFIG_A64MULTI5_ENCODER)       += a64multienc.o elbg.o
  OBJS-$(CONFIG_AAC_DECODER)             += aacdec.o aactab.o aacsbr.o aacps.o \
@@@ -552,10 -460,9 +553,10 @@@ OBJS-$(CONFIG_WMAVOICE_DECODER)        
                                            celp_filters.o \
                                            acelp_vectors.o acelp_filters.o
  OBJS-$(CONFIG_WMV1_DECODER)            += msmpeg4dec.o msmpeg4.o msmpeg4data.o
- OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o wmv2dsp.o \
 +OBJS-$(CONFIG_WMV1_ENCODER)            += msmpeg4enc.o
+ OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o \
                                            msmpeg4dec.o msmpeg4.o msmpeg4data.o
- OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o wmv2dsp.o \
+ OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o \
                                            msmpeg4.o msmpeg4enc.o msmpeg4data.o
  OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.o
  OBJS-$(CONFIG_WS_SND1_DECODER)         += ws-snd1.o