diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 12:55:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 12:55:26 +0200 |
| commit | 32ea39f56d90585c63eedfcb631e0a939fc1f95e (patch) | |
| tree | fc23e9cf250c9b2b9b05f617d1513d5386b4de78 /libavcodec/aac.h | |
| parent | 257f11820bdf628648466ce07ee0bf67217b543e (diff) | |
| parent | 1914e6f010b3320025c7b692aaea51d9b9a992a8 (diff) | |
| download | ffmpeg-32ea39f56d90585c63eedfcb631e0a939fc1f95e.tar.gz | |
Merge commit '1914e6f010b3320025c7b692aaea51d9b9a992a8'
* commit '1914e6f010b3320025c7b692aaea51d9b9a992a8':
aacdec: Add support for LD (Low Delay) AAC
Conflicts:
Changelog
libavcodec/aacdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac.h')
| -rw-r--r-- | libavcodec/aac.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 209c715e36..cda14777c4 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -290,6 +290,7 @@ struct AACContext { */ FFTContext mdct; FFTContext mdct_small; + FFTContext mdct_ld; FFTContext mdct_ltp; FmtConvertContext fmt_conv; AVFloatDSPContext fdsp; |