diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 14:36:00 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 14:36:00 +0100 |
commit | 365ad0042a637a421602d248f1cd9d2dc87d61c4 (patch) | |
tree | 52411ba18f8cb4900140a30b22d732c0d3bf84ef /configure | |
parent | 62d36abef4b7bf49856b0838bd87f7a23910a391 (diff) | |
parent | 0b499c9b06b29b3d3fa23122b493945dbf77f707 (diff) | |
download | ffmpeg-365ad0042a637a421602d248f1cd9d2dc87d61c4.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Make it possible to compile without error_resilience
Conflicts:
configure
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -133,6 +133,7 @@ Component options: --disable-network disable network support [no] --disable-dct disable DCT code --disable-dwt disable DWT code + --disable-error-resilience disable error resilience code --disable-lsp disable LSP code --disable-lzo disable LZO decoder code --disable-mdct disable MDCT code @@ -1226,6 +1227,7 @@ CONFIG_LIST=" $PROGRAM_LIST dct dwt + error_resilience fast_unaligned fft ftrapv @@ -1510,7 +1512,6 @@ CONFIG_EXTRA=" ac3dsp audio_frame_queue dsputil - error_resilience frame_thread_encoder gcrypt golomb @@ -1738,6 +1739,7 @@ h263_encoder_select="aandcttables mpegvideoenc" h263i_decoder_select="h263_decoder" h263p_encoder_select="h263_encoder" h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel videodsp" +h264_decoder_suggest="error_resilience" huffyuv_decoder_select="dsputil" huffyuv_encoder_select="huffman" iac_decoder_select="fft mdct sinewin" @@ -1809,8 +1811,8 @@ sonic_encoder_select="golomb" sonic_ls_encoder_select="golomb" svq1_decoder_select="hpeldsp" svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc" -svq3_decoder_select="dsputil error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo videodsp" -svq3_decoder_suggest="zlib" +svq3_decoder_select="dsputil golomb h264chroma h264dsp h264pred h264qpel mpegvideo videodsp" +svq3_decoder_suggest="error_resilience zlib" tak_decoder_select="dsputil" theora_decoder_select="vp3_decoder" tiff_decoder_suggest="zlib" |