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/aactab.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/aactab.h')
| -rw-r--r-- | libavcodec/aactab.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h index 6ed3b4a6be..e06f6824ae 100644 --- a/libavcodec/aactab.h +++ b/libavcodec/aactab.h @@ -45,6 +45,7 @@ * @{ */ DECLARE_ALIGNED(32, extern float, ff_aac_kbd_long_1024)[1024]; +DECLARE_ALIGNED(32, extern float, ff_aac_kbd_long_512 )[512]; DECLARE_ALIGNED(32, extern float, ff_aac_kbd_short_128)[128]; // @} @@ -52,6 +53,7 @@ DECLARE_ALIGNED(32, extern float, ff_aac_kbd_short_128)[128]; * @{ */ extern const uint8_t ff_aac_num_swb_1024[]; +extern const uint8_t ff_aac_num_swb_512 []; extern const uint8_t ff_aac_num_swb_128 []; // @} @@ -69,6 +71,7 @@ extern const float *ff_aac_codebook_vector_vals[]; extern const uint16_t *ff_aac_codebook_vector_idx[]; extern const uint16_t * const ff_swb_offset_1024[13]; +extern const uint16_t * const ff_swb_offset_512 [13]; extern const uint16_t * const ff_swb_offset_128 [13]; extern const uint8_t ff_tns_max_bands_1024[13]; |