diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:51:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:51:54 +0200 |
| commit | ffc2c095ef7c4bf8b330a841f9ed76b0648bbc2d (patch) | |
| tree | 19e42c99ebca56c87707a4557f6046b804b2f721 | |
| parent | 7695a538ed24e3cef52f74a4eee731d137a97f4e (diff) | |
| parent | a6a675a79287565c3c23455439b114676b63a96c (diff) | |
| download | ffmpeg-ffc2c095ef7c4bf8b330a841f9ed76b0648bbc2d.tar.gz | |
Merge commit 'a6a675a79287565c3c23455439b114676b63a96c'
* commit 'a6a675a79287565c3c23455439b114676b63a96c':
configure: Drop stray error resilience dependencies
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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" |