Merge commit '9ecf1b62f37ef9cbdf2d7300a052cd704c4ba731'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:16:02 +0000 (21:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:16:13 +0000 (21:16 +0100)
* commit '9ecf1b62f37ef9cbdf2d7300a052cd704c4ba731':
  build: Drop stray MLP decoder dependency on dsputil

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -1989,10 -1730,10 +1989,10 @@@ loco_decoder_select="golomb
  mdec_decoder_select="dsputil error_resilience mpegvideo"
  metasound_decoder_select="lsp mdct sinewin"
  mimic_decoder_select="dsputil hpeldsp"
 -mjpeg_decoder_select="dsputil hpeldsp"
 +mjpeg_decoder_select="dsputil hpeldsp exif"
  mjpeg_encoder_select="aandcttables dsputil mpegvideoenc"
  mjpegb_decoder_select="mjpeg_decoder"
- mlp_decoder_select="dsputil mlp_parser"
+ mlp_decoder_select="mlp_parser"
  motionpixels_decoder_select="dsputil"
  mp1_decoder_select="mpegaudio"
  mp1float_decoder_select="mpegaudio"