diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:37:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:37:21 +0100 |
| commit | 1f3a577353ed684ca1d91a86dea62ed7bb334c87 (patch) | |
| tree | 4b312060bcdb556f79c2b72afe5a1c04219de61f | |
| parent | e9fbb9783c825250b4d06dded8ac2b712284b4e9 (diff) | |
| parent | 4be368b504c6f4a03051448728fc62cd0ed506b2 (diff) | |
| download | ffmpeg-1f3a577353ed684ca1d91a86dea62ed7bb334c87.tar.gz | |
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>
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | libavutil/avstring.c | 2 |
2 files changed, 6 insertions, 6 deletions
@@ -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" diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 788667e9d6..cf9be2a0d5 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -304,7 +304,7 @@ int av_isspace(int c) int av_isxdigit(int c) { c = av_tolower(c); - return av_isdigit(c) || (c >= 'a' && c <= 'z'); + return av_isdigit(c) || (c >= 'a' && c <= 'f'); } #ifdef TEST |