Merge commit '4be368b504c6f4a03051448728fc62cd0ed506b2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:37:00 +0000 (15:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:37:21 +0000 (15:37 +0100)
* 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>
1  2 
configure
libavutil/avstring.c

diff --cc configure
+++ b/configure
@@@ -1772,18 -1593,13 +1772,18 @@@ rv10_decoder_select="error_resilience h
  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"
 +snow_encoder_select="aandcttables dwt h264qpel error_resilience mpegvideoenc rangecoder"
 +sonic_decoder_select="golomb"
 +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"
Simple merge