[FFmpeg-cvslog] Merge commit '6ef3360a38efe027cb6ebf9785870048ca7eb38b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Apr  9 15:05:31 2017 +0200| [41a2208035317b9c17ebe6820bc06bc2330d3d4b] | committer: Clément Bœsch

Merge commit '6ef3360a38efe027cb6ebf9785870048ca7eb38b'

* commit '6ef3360a38efe027cb6ebf9785870048ca7eb38b':
  configure: Add misssing qpeldsp dependency to mss2 decoder

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41a2208035317b9c17ebe6820bc06bc2330d3d4b
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index df9890d68b..c15fa21baf 100755
--- a/configure
+++ b/configure
@@ -2487,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="mpegvideo qpeldsp vc1_decoder"
 mts2_decoder_select="mss34dsp"
 mxpeg_decoder_select="mjpeg_decoder"
 nellymoser_decoder_select="mdct sinewin"


======================================================================

diff --cc configure
index df9890d68b,e348f3be65..c15fa21baf
--- a/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"