Merge commit '73953df71a28e94d8959facba7906cf5975ca4ef'

[ffmpeg] / configure

diff --git a/configure b/configure
index c414b8be4c3621226eb34754f8a30e6c5a7878a1..c32664200ec589f3e0525fd05471883f87556e91 100755 (executable)
--- a/configure
+++ b/configure
@@ -2084,7 +2084,7 @@ jv_decoder_select="blockdsp"
 lagarith_decoder_select="huffyuvdsp"
 ljpeg_encoder_select="aandcttables mpegvideoenc"
 loco_decoder_select="golomb"
-mdec_decoder_select="blockdsp dsputil error_resilience mpegvideo"
+mdec_decoder_select="blockdsp dsputil mpegvideo"
 metasound_decoder_select="lsp mdct sinewin"
 mimic_decoder_select="blockdsp dsputil hpeldsp"
 mjpeg_decoder_select="blockdsp dsputil hpeldsp exif"
@@ -2270,7 +2270,7 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
 # parsers
 h264_parser_select="h264_decoder"
 hevc_parser_select="hevc_decoder"
-mpegvideo_parser_select="error_resilience mpegvideo"
+mpegvideo_parser_select="mpegvideo"
 mpeg4video_parser_select="error_resilience h263dsp mpegvideo qpeldsp"
 vc1_parser_select="mpegvideo vc1_decoder"