Merge commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f'

* commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f': build: Drop stray MJPEG encoder dependency on dsputil Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 2631d155ba
parent 07dbdcf9d0 6cd76e5412
commit 2631d155ba
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -1990,7 +1990,7 @@ mdec_decoder_select="dsputil error_resilience mpegvideo"
 metasound_decoder_select="lsp mdct sinewin"
 mimic_decoder_select="dsputil hpeldsp"
 mjpeg_decoder_select="dsputil hpeldsp exif"
-mjpeg_encoder_select="aandcttables dsputil mpegvideoenc"
+mjpeg_encoder_select="aandcttables mpegvideoenc"
 mjpegb_decoder_select="mjpeg_decoder"
 mlp_decoder_select="mlp_parser"
 motionpixels_decoder_select="dsputil"