summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2013-03-02 16:57:26 -0800
committerMartin Storsjö <martin@martin.st>2013-03-26 09:55:05 +0200
commit0b499c9b06b29b3d3fa23122b493945dbf77f707 (patch)
tree0c35583e7adbf3cda3ce2924c664858cb7794835 /configure
parentf1e9398621af0bc9d166014e4ce6996bb4f141d0 (diff)
h264: Make it possible to compile without error_resilience
Error resilience is enabled by the h264 decoder, unless explicitly disabled. --disable-everything --enable-decoder=h264 will produce a h264 decoder with error resilience enabled, while --disable-everything --enable-decoder=h264 --disable-error-resilience will produce a h264 decoder with error resilience disabled. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 7 insertions, 5 deletions
diff --git a/configure b/configure
index 90ac9469b0..e0b980ae8c 100755
--- a/configure
+++ b/configure
@@ -122,6 +122,7 @@ Component options:
--disable-w32threads disable Win32 threads [auto]
--disable-network disable network support [no]
--disable-dct disable DCT code
+ --disable-error-resilience disable error resilience code
--disable-lsp disable LSP code
--disable-lzo disable LZO decoder code
--disable-mdct disable MDCT code
@@ -1091,6 +1092,7 @@ CONFIG_LIST="
$PROGRAM_LIST
dct
doc
+ error_resilience
fft
gpl
gray
@@ -1349,7 +1351,6 @@ CONFIG_EXTRA="
aandcttables
ac3dsp
audio_frame_queue
- error_resilience
gcrypt
golomb
gplv3
@@ -1544,7 +1545,8 @@ h263_decoder_select="error_resilience h263_parser mpegvideo"
h263_encoder_select="aandcttables mpegvideoenc"
h263i_decoder_select="h263_decoder"
h263p_encoder_select="h263_encoder"
-h264_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel videodsp"
+h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
+h264_decoder_suggest="error_resilience"
huffyuv_encoder_select="huffman"
iac_decoder_select="fft mdct sinewin"
imc_decoder_select="fft mdct sinewin"
@@ -1601,8 +1603,8 @@ shorten_decoder_select="golomb"
sipr_decoder_select="lsp"
svq1_decoder_select="mpegvideo"
svq1_encoder_select="aandcttables mpegvideoenc"
-svq3_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo videodsp"
-svq3_decoder_suggest="zlib"
+svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel mpegvideo videodsp"
+svq3_decoder_suggest="error_resilience zlib"
theora_decoder_select="vp3_decoder"
tiff_decoder_suggest="zlib"
tiff_encoder_suggest="zlib"
@@ -1691,7 +1693,7 @@ wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
# parsers
-h264_parser_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel videodsp"
+h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
mpeg4video_parser_select="error_resilience mpegvideo"
mpegvideo_parser_select="error_resilience mpegvideo"
vc1_parser_select="mpegvideo"