diff options
Diffstat (limited to 'libavcodec/aac.h')
| -rw-r--r-- | libavcodec/aac.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 1a8aa6c145..94f578ff38 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -38,12 +38,6 @@ #include <stdint.h> -#define AAC_INIT_VLC_STATIC(num, size) \ - INIT_VLC_STATIC(&vlc_spectral[num], 8, ff_aac_spectral_sizes[num], \ - ff_aac_spectral_bits[num], sizeof( ff_aac_spectral_bits[num][0]), sizeof( ff_aac_spectral_bits[num][0]), \ - ff_aac_spectral_codes[num], sizeof(ff_aac_spectral_codes[num][0]), sizeof(ff_aac_spectral_codes[num][0]), \ - size); - #define MAX_CHANNELS 64 #define MAX_ELEM_ID 16 @@ -241,7 +235,7 @@ typedef struct { * main AAC context */ typedef struct { - AVCodecContext * avccontext; + AVCodecContext *avctx; MPEG4AudioConfig m4ac; @@ -255,8 +249,9 @@ typedef struct { enum ChannelPosition che_pos[4][MAX_ELEM_ID]; /**< channel element channel mapping with the * first index as the first 4 raw data block types */ - ChannelElement * che[4][MAX_ELEM_ID]; - ChannelElement * tag_che_map[4][MAX_ELEM_ID]; + ChannelElement *che[4][MAX_ELEM_ID]; + ChannelElement *tag_che_map[4][MAX_ELEM_ID]; + uint8_t tags_seen_this_frame[4][MAX_ELEM_ID]; int tags_mapped; /** @} */ |