Merge commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:05:18 +0000 (15:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:05:18 +0000 (15:05 +0100)
* commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98':
  build: Fix error_resilience code dependencies

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -1699,10 -1522,9 +1699,10 @@@ dnxhd_encoder_select="aandcttables mpeg
  dxa_decoder_select="zlib"
  eac3_decoder_select="ac3_decoder"
  eac3_encoder_select="ac3_encoder"
- eamad_decoder_select="aandcttables error_resilience mpegvideo"
+ eamad_decoder_select="aandcttables mpegvideo"
  eatgq_decoder_select="aandcttables"
- eatqi_decoder_select="aandcttables error_resilience mpegvideo"
+ eatqi_decoder_select="aandcttables mpegvideo"
 +exr_decoder_select="zlib"
  ffv1_decoder_select="golomb rangecoder"
  ffv1_encoder_select="rangecoder"
  ffvhuff_encoder_select="huffman"
@@@ -1718,10 -1539,10 +1718,10 @@@ fraps_decoder_select="huffman
  h261_decoder_select="error_resilience mpegvideo"
  h261_encoder_select="aandcttables mpegvideoenc"
  h263_decoder_select="error_resilience h263_parser mpegvideo"
- h263_encoder_select="aandcttables error_resilience mpegvideoenc"
+ 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"
  huffyuv_encoder_select="huffman"
  iac_decoder_select="fft mdct sinewin"
  imc_decoder_select="fft mdct sinewin"
@@@ -1776,13 -1597,8 +1776,13 @@@ rv30_decoder_select="error_resilience g
  rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo"
  shorten_decoder_select="golomb"
  sipr_decoder_select="lsp"
- svq1_decoder_select="error_resilience mpegvideo"
- svq1_encoder_select="aandcttables error_resilience mpegvideoenc"
 +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_suggest="zlib"
  theora_decoder_select="vp3_decoder"
@@@ -1882,14 -1689,12 +1882,14 @@@ wmv3_vdpau_decoder_select="vc1_vdpau_de
  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="error_resilience mpegvideo"
+ vc1_parser_select="mpegvideo"
  
  # external libraries
 +libaacplus_encoder_deps="libaacplus"
 +libcelt_decoder_deps="libcelt"
  libfaac_encoder_deps="libfaac"
  libfaac_encoder_select="audio_frame_queue"
  libfdk_aac_encoder_deps="libfdk_aac"