Merge commit '6ef3360a38efe027cb6ebf9785870048ca7eb38b'
authorClément Bœsch <u@pkh.me>
Sun, 9 Apr 2017 13:05:31 +0000 (15:05 +0200)
committerClément Bœsch <u@pkh.me>
Sun, 9 Apr 2017 13:05:31 +0000 (15:05 +0200)
* commit '6ef3360a38efe027cb6ebf9785870048ca7eb38b':
  configure: Add misssing qpeldsp dependency to mss2 decoder

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -2487,7 -2036,7 +2487,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 mpegvideo"
 -mss2_decoder_select="error_resilience mpeg_er mpegvideo qpeldsp vc1_decoder"
++mss2_decoder_select="mpegvideo qpeldsp vc1_decoder"
  mts2_decoder_select="mss34dsp"
  mxpeg_decoder_select="mjpeg_decoder"
  nellymoser_decoder_select="mdct sinewin"