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 /libavcodec/aac.h | |
| parent | dd72e26d0cea78093324bdc5c0088aa53f2983a2 (diff) | |
| parent | d615187f74ddf3413778a8b5b7ae17255b0df88e (diff) | |
| download | ffmpeg-ba4fba8f487380a0152b73ba6f9f5e5556322ae7.tar.gz | |
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 'libavcodec/aac.h')
| -rw-r--r-- | libavcodec/aac.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index a15173788f..3d0caedc63 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -32,6 +32,7 @@ #include "libavutil/float_dsp.h" #include "avcodec.h" +#include "imdct15.h" #include "fft.h" #include "mpeg4audio.h" #include "sbr.h" @@ -294,6 +295,7 @@ struct AACContext { FFTContext mdct_small; FFTContext mdct_ld; FFTContext mdct_ltp; + IMDCT15Context *mdct480; FmtConvertContext fmt_conv; AVFloatDSPContext *fdsp; int random_state; |