Merge commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:12:26 +0000 (18:12 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:12:26 +0000 (18:12 +0000)
* commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac':
  build: Add missing mpegvideo dependency for the MSS2 and VC-1 decoders

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

diff --cc configure
+++ b/configure
@@@ -2383,7 -2009,7 +2383,7 @@@ msmpeg4v2_decoder_select="h263_decoder
  msmpeg4v2_encoder_select="h263_encoder"
  msmpeg4v3_decoder_select="h263_decoder"
  msmpeg4v3_encoder_select="h263_encoder"
- mss2_decoder_select="vc1_decoder"
 -mss2_decoder_select="error_resilience mpeg_er mpegvideo vc1_decoder"
++mss2_decoder_select="vc1_decoder mpegvideo"
  mts2_decoder_select="mss34dsp"
  mxpeg_decoder_select="mjpeg_decoder"
  nellymoser_decoder_select="mdct sinewin"
@@@ -2438,9 -2060,7 +2438,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 qpeldsp startcode"
 -vc1_decoder_select="blockdsp error_resilience h263_decoder h264chroma h264qpel intrax8 mpeg_er mpegvideo qpeldsp startcode"
++vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideo qpeldsp startcode"
 +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"