diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:23:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:23:42 +0100 |
| commit | 981aa023387ebfaa19ea8079e423d72cd0321b0b (patch) | |
| tree | ea594083e20d54b223c44b0a3b9e50d701b49ac2 | |
| parent | 2631d155baa5bf9e335925d44fcfd276c6d3719f (diff) | |
| parent | 0e29c5e1285eeb5b4842d96d00dfe06898cd87e5 (diff) | |
| download | ffmpeg-981aa023387ebfaa19ea8079e423d72cd0321b0b.tar.gz | |
Merge commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5'
* commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5':
build: Drop stray LPC dependency on dsputil
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1895,7 +1895,6 @@ threads_if_any="$THREADS_LIST" dct_select="rdft" error_resilience_select="dsputil" frame_thread_encoder_deps="encoders threads" -lpc_select="dsputil" mdct_select="fft" rdft_select="fft" mpegaudio_select="mpegaudiodsp" |