Merge commit 'c54e118722cbbdc04945538d1796d4472a1ff406'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:39:53 +0000 (00:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:39:53 +0000 (00:39 +0200)
* commit 'c54e118722cbbdc04945538d1796d4472a1ff406':
  build: Have the eatqi decoder depend on the MPEG-1 decoder

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -2042,9 -1748,9 +2042,9 @@@ dxa_decoder_select="zlib
  eac3_decoder_select="ac3_decoder"
  eac3_encoder_select="ac3_encoder"
  eamad_decoder_select="aandcttables blockdsp dsputil mpegvideo"
 -eatgq_decoder_select="aandcttables dsputil"
 +eatgq_decoder_select="aandcttables"
- eatqi_decoder_select="aandcttables blockdsp dsputil error_resilience mpegvideo"
+ eatqi_decoder_select="aandcttables blockdsp dsputil mpeg1video_decoder"
 -exr_decoder_deps="zlib"
 +exr_decoder_select="zlib"
  ffv1_decoder_select="golomb rangecoder"
  ffv1_encoder_select="rangecoder"
  ffvhuff_decoder_select="huffyuv_decoder"
Simple merge