Merge commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:45:58 +0000 (00:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:45:58 +0000 (00:45 +0200)
* commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0':
  build: Record explicit dependency of intrax8 on error resilience

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -1991,7 -1702,7 +1991,8 @@@ threads_if_any="$THREADS_LIST
  # subsystems
  dct_select="rdft"
  error_resilience_select="dsputil"
 +frame_thread_encoder_deps="encoders threads"
+ intrax8_select="error_resilience"
  mdct_select="fft"
  rdft_select="fft"
  mpegaudio_select="mpegaudiodsp"