Merge commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:40:41 +0000 (21:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:40:41 +0000 (21:40 +0100)
* commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a':
  build: Record dependency of eatqi decoder on dsputil

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -1944,9 -1687,8 +1944,9 @@@ dxa_decoder_select="zlib
  eac3_decoder_select="ac3_decoder"
  eac3_encoder_select="ac3_encoder"
  eamad_decoder_select="aandcttables dsputil mpegvideo"
 -eatgq_decoder_select="aandcttables dsputil"
 +eatgq_decoder_select="aandcttables"
- eatqi_decoder_select="aandcttables error_resilience mpegvideo"
+ eatqi_decoder_select="aandcttables dsputil error_resilience mpegvideo"
 +exr_decoder_select="zlib"
  ffv1_decoder_select="golomb rangecoder"
  ffv1_encoder_select="rangecoder"
  ffvhuff_decoder_select="huffyuv_decoder"