Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-08 18:37:00 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-03-08 18:37:21 +0400
commit1f3a577353ed684ca1d91a86dea62ed7bb334c87 (patch)
tree4b312060bcdb556f79c2b72afe5a1c04219de61f /configure
parente9fbb9783c825250b4d06dded8ac2b712284b4e9 (diff)
parent4be368b504c6f4a03051448728fc62cd0ed506b2 (diff)
Merge commit '4be368b504c6f4a03051448728fc62cd0ed506b2'
* commit '4be368b504c6f4a03051448728fc62cd0ed506b2': avstring: Fix isxdigit to not accept non-hex characters configure: Add missing videodsp dependencies to some decoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index 0ee6b54e57..51d191ec5e 100755
--- a/configure
+++ b/configure
@@ -1688,7 +1688,7 @@ atrac1_decoder_select="mdct sinewin"
atrac3_decoder_select="mdct"
binkaudio_dct_decoder_select="mdct rdft dct sinewin"
binkaudio_rdft_decoder_select="mdct rdft sinewin"
-cavs_decoder_select="golomb h264chroma mpegvideo"
+cavs_decoder_select="golomb h264chroma mpegvideo videodsp"
comfortnoise_encoder_select="lpc"
cook_decoder_select="mdct sinewin"
cscd_decoder_select="lzo"
@@ -1772,8 +1772,8 @@ rv10_decoder_select="error_resilience h263_decoder"
rv10_encoder_select="h263_encoder"
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"
+rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo videodsp"
+rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo videodsp"
shorten_decoder_select="golomb"
sipr_decoder_select="lsp"
snow_decoder_select="dwt h264qpel rangecoder"
@@ -1783,7 +1783,7 @@ sonic_encoder_select="golomb"
sonic_ls_encoder_select="golomb"
svq1_decoder_select="mpegvideo"
svq1_encoder_select="aandcttables mpegvideoenc"
-svq3_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo"
+svq3_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo videodsp"
svq3_decoder_suggest="zlib"
theora_decoder_select="vp3_decoder"
tiff_decoder_suggest="zlib"
@@ -1810,7 +1810,7 @@ wmav2_encoder_select="mdct sinewin"
wmavoice_decoder_select="lsp rdft dct mdct sinewin"
wmv1_decoder_select="h263_decoder"
wmv1_encoder_select="h263_encoder"
-wmv2_decoder_select="h263_decoder"
+wmv2_decoder_select="h263_decoder videodsp"
wmv2_encoder_select="h263_encoder"
wmv3_decoder_select="vc1_decoder"
wmv3image_decoder_select="wmv3_decoder"