Merge commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:23:42 +0000 (21:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:23:42 +0000 (21:23 +0100)
* commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5':
  build: Drop stray LPC dependency on dsputil

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -1894,8 -1641,6 +1894,7 @@@ threads_if_any="$THREADS_LIST
  # subsystems
  dct_select="rdft"
  error_resilience_select="dsputil"
- lpc_select="dsputil"
 +frame_thread_encoder_deps="encoders threads"
  mdct_select="fft"
  rdft_select="fft"
  mpegaudio_select="mpegaudiodsp"