diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 21:35:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 21:35:02 +0200 |
| commit | 79df91bfc403e97e50f3ba0ed9acabeeb5590cd4 (patch) | |
| tree | 02970fac33073c2792133aabf09efcea797d3710 /configure | |
| parent | 94c4ad27dc6305a7e1f218b86311db019e41f632 (diff) | |
| parent | bd499d9af668aef979ec9f3f3215b8dd508c7ec1 (diff) | |
Merge commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1'
* commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1':
build: Conditionally build and test iirfilter
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1821,6 +1821,7 @@ CONFIG_EXTRA=" huffyuvdsp huffyuvencdsp idctdsp + iirfilter intrax8 lgplv3 llauddsp @@ -2016,7 +2017,7 @@ mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp" # decoders / encoders aac_decoder_select="mdct sinewin" -aac_encoder_select="audio_frame_queue mdct sinewin" +aac_encoder_select="audio_frame_queue iirfilter mdct sinewin" aac_latm_decoder_select="aac_decoder aac_latm_parser" ac3_decoder_select="ac3_parser ac3dsp bswapdsp mdct" ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp mdct" |