diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 13:49:17 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 13:49:17 +0100 |
commit | ba4fba8f487380a0152b73ba6f9f5e5556322ae7 (patch) | |
tree | 54852b218d42e3bd155961e72c966ac957626b49 /configure | |
parent | dd72e26d0cea78093324bdc5c0088aa53f2983a2 (diff) | |
parent | d615187f74ddf3413778a8b5b7ae17255b0df88e (diff) |
Merge commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e'
* commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e':
aacdec: Support for ER AAC ELD 480.
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2068,7 +2068,7 @@ mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp videodsp" mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp" # decoders / encoders -aac_decoder_select="mdct sinewin" +aac_decoder_select="imdct15 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" |