diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:05:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:05:18 +0100 |
| commit | b094931ab91108950fec221291bebcbc7b0ac12a (patch) | |
| tree | 91853f8c8b2e42fd0b25826c75ab86ba53083ce2 | |
| parent | 6c17ff84ad8f2be64ddc9bd4955e1cc87842ac29 (diff) | |
| parent | 06b54e84254e4834b4978ff5b27cc2b7ee8d7a98 (diff) | |
| download | ffmpeg-b094931ab91108950fec221291bebcbc7b0ac12a.tar.gz | |
Merge commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'
* commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98':
build: Fix error_resilience code dependencies
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -1699,9 +1699,9 @@ dnxhd_encoder_select="aandcttables mpegvideoenc" dxa_decoder_select="zlib" eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" -eamad_decoder_select="aandcttables error_resilience mpegvideo" +eamad_decoder_select="aandcttables mpegvideo" eatgq_decoder_select="aandcttables" -eatqi_decoder_select="aandcttables error_resilience mpegvideo" +eatqi_decoder_select="aandcttables mpegvideo" exr_decoder_select="zlib" ffv1_decoder_select="golomb rangecoder" ffv1_encoder_select="rangecoder" @@ -1718,7 +1718,7 @@ fraps_decoder_select="huffman" h261_decoder_select="error_resilience mpegvideo" h261_encoder_select="aandcttables mpegvideoenc" h263_decoder_select="error_resilience h263_parser mpegvideo" -h263_encoder_select="aandcttables error_resilience mpegvideoenc" +h263_encoder_select="aandcttables mpegvideoenc" h263i_decoder_select="h263_decoder" h263p_encoder_select="h263_encoder" h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel videodsp" @@ -1747,9 +1747,9 @@ mpc8_decoder_select="mpegaudiodsp" mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" mpeg_xvmc_decoder_select="mpegvideo_decoder" mpeg1video_decoder_select="error_resilience mpegvideo" -mpeg1video_encoder_select="aandcttables error_resilience mpegvideoenc" +mpeg1video_encoder_select="aandcttables mpegvideoenc" mpeg2video_decoder_select="error_resilience mpegvideo" -mpeg2video_encoder_select="aandcttables error_resilience mpegvideoenc" +mpeg2video_encoder_select="aandcttables mpegvideoenc" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" msmpeg4v1_decoder_select="h263_decoder" @@ -1758,7 +1758,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" +mss2_decoder_select="error_resilience vc1_decoder" nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" nuv_decoder_select="lzo" @@ -1768,9 +1768,9 @@ qcelp_decoder_select="lsp" qdm2_decoder_select="mdct rdft mpegaudiodsp" ra_144_encoder_select="audio_frame_queue lpc" ralf_decoder_select="golomb" -rv10_decoder_select="h263_decoder" +rv10_decoder_select="error_resilience h263_decoder" rv10_encoder_select="h263_encoder" -rv20_decoder_select="h263_decoder" +rv20_decoder_select="error_resilience h263_decoder" rv20_encoder_select="h263_encoder" rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo" rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo" @@ -1781,8 +1781,8 @@ snow_encoder_select="aandcttables dwt h264qpel error_resilience mpegvideoenc ran sonic_decoder_select="golomb" sonic_encoder_select="golomb" sonic_ls_encoder_select="golomb" -svq1_decoder_select="error_resilience mpegvideo" -svq1_encoder_select="aandcttables error_resilience mpegvideoenc" +svq1_decoder_select="mpegvideo" +svq1_encoder_select="aandcttables mpegvideoenc" svq3_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo" svq3_decoder_suggest="zlib" theora_decoder_select="vp3_decoder" @@ -1792,7 +1792,7 @@ truehd_decoder_select="mlp_parser" tscc_decoder_select="zlib" twinvq_decoder_select="mdct lsp sinewin" utvideo_encoder_select="huffman" -vc1_decoder_select="h263_decoder h264chroma h264qpel" +vc1_decoder_select="error_resilience h263_decoder h264chroma h264qpel" vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" @@ -1885,7 +1885,7 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp" mpeg4video_parser_select="error_resilience mpegvideo" mpegvideo_parser_select="error_resilience mpegvideo" -vc1_parser_select="error_resilience mpegvideo" +vc1_parser_select="mpegvideo" # external libraries libaacplus_encoder_deps="libaacplus" |