diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-02 20:43:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-02 20:43:13 +0100 |
| commit | 7b32b35bf5c4b02a959477392dfe8963a33a6436 (patch) | |
| tree | 62e4e24be6022d0fa9530a673f5f32a72df6696d /configure | |
| parent | aab902e64668dcc889cf3c76d3d62bd58668af59 (diff) | |
| parent | 3d5d46233cd81f78138a6d7418d480af04d3f6c8 (diff) | |
| download | ffmpeg-streaming-7b32b35bf5c4b02a959477392dfe8963a33a6436.zip ffmpeg-streaming-7b32b35bf5c4b02a959477392dfe8963a33a6436.tar.gz | |
Merge commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8'
* commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8':
opus: Factor out imdct15 into a standalone component
Conflicts:
configure
libavcodec/opus_celt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1868,6 +1868,7 @@ CONFIG_EXTRA=" huffyuvencdsp idctdsp iirfilter + imdct15 intrax8 lgplv3 llauddsp @@ -2192,6 +2193,7 @@ nellymoser_encoder_select="audio_frame_queue mdct sinewin" nuv_decoder_select="idctdsp lzo" on2avc_decoder_select="mdct" opus_decoder_deps="swresample" +opus_decoder_select="imdct15" png_decoder_select="zlib" png_encoder_select="huffyuvencdsp zlib" prores_decoder_select="blockdsp idctdsp" |
