Merge commit '34150be515cd9c43b0b679806b8d01774960af78'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 11:27:59 +0000 (12:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 11:27:59 +0000 (12:27 +0100)
* commit '34150be515cd9c43b0b679806b8d01774960af78':
  build: Let the iac decoder depend on the imc decoder

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -1948,9 -1692,9 +1948,9 @@@ h263p_encoder_select="h263_encoder
  h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
  h264_decoder_suggest="error_resilience"
  hevc_decoder_select="dsputil golomb videodsp"
 -huffyuv_decoder_select="dsputil"
 -huffyuv_encoder_select="dsputil huffman"
 +huffyuv_decoder_select="dsputil llviddsp"
 +huffyuv_encoder_select="dsputil huffman llviddsp"
- iac_decoder_select="dsputil fft mdct sinewin"
+ iac_decoder_select="imc_decoder"
  imc_decoder_select="dsputil fft mdct sinewin"
  indeo3_decoder_select="hpeldsp"
  interplay_video_decoder_select="hpeldsp"
@@@ -243,9 -204,7 +243,8 @@@ OBJS-$(CONFIG_HEVC_DECODER)            
  OBJS-$(CONFIG_HNM4_VIDEO_DECODER)      += hnm4video.o
  OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o huffyuvdec.o
  OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o huffyuvenc.o
- OBJS-$(CONFIG_IAC_DECODER)             += imc.o
  OBJS-$(CONFIG_IDCIN_DECODER)           += idcinvideo.o
 +OBJS-$(CONFIG_IDF_DECODER)             += bintext.o cga_data.o
  OBJS-$(CONFIG_IFF_BYTERUN1_DECODER)    += iff.o
  OBJS-$(CONFIG_IFF_ILBM_DECODER)        += iff.o
  OBJS-$(CONFIG_IMC_DECODER)             += imc.o