diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2015-08-22 04:30:15 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-08-22 04:30:15 +0100 |
| commit | 15ebc7787c6c693ba846db6c730e1cefd62b5119 (patch) | |
| tree | 8c5a2ceba93b26d945779d71872ecde3f21a793b /libavcodec | |
| parent | 5cbcf2b24d287fe465926e3b31ef30f7bc92070e (diff) | |
| download | ffmpeg-15ebc7787c6c693ba846db6c730e1cefd62b5119.tar.gz | |
aacenctab: Add missing ff_ prefixes
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacenc.c | 6 | ||||
| -rw-r--r-- | libavcodec/aacenctab.c | 8 | ||||
| -rw-r--r-- | libavcodec/aacenctab.h | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index af77379d1c..71071eb191 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -778,7 +778,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) s->channels = avctx->channels; - ERROR_IF(i == 16 || i >= swb_size_1024_len || i >= swb_size_128_len, + ERROR_IF(i == 16 || i >= ff_aac_swb_size_1024_len || i >= ff_aac_swb_size_128_len, "Unsupported sample rate %d\n", avctx->sample_rate); ERROR_IF(s->channels > AAC_MAX_CHANNELS, "Unsupported number of channels: %d\n", s->channels); @@ -813,8 +813,8 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) avctx->extradata_size = 5; put_audio_specific_config(avctx); - sizes[0] = swb_size_1024[i]; - sizes[1] = swb_size_128[i]; + sizes[0] = ff_aac_swb_size_1024[i]; + sizes[1] = ff_aac_swb_size_128[i]; lengths[0] = ff_aac_num_swb_1024[i]; lengths[1] = ff_aac_num_swb_128[i]; for (i = 0; i < s->chan_map[0]; i++) diff --git a/libavcodec/aacenctab.c b/libavcodec/aacenctab.c index e56be2bd9b..b6ee0dee99 100644 --- a/libavcodec/aacenctab.c +++ b/libavcodec/aacenctab.c @@ -88,7 +88,7 @@ static const uint8_t swb_size_1024_8[] = { 32, 36, 36, 40, 44, 48, 52, 56, 60, 64, 80 }; -const uint8_t *swb_size_128[] = { +const uint8_t *ff_aac_swb_size_128[] = { swb_size_128_96, swb_size_128_96, swb_size_128_64, swb_size_128_48, swb_size_128_48, swb_size_128_48, swb_size_128_24, swb_size_128_24, swb_size_128_16, @@ -96,7 +96,7 @@ const uint8_t *swb_size_128[] = { swb_size_128_8 }; -const uint8_t *swb_size_1024[] = { +const uint8_t *ff_aac_swb_size_1024[] = { swb_size_1024_96, swb_size_1024_96, swb_size_1024_64, swb_size_1024_48, swb_size_1024_48, swb_size_1024_32, swb_size_1024_24, swb_size_1024_24, swb_size_1024_16, @@ -104,5 +104,5 @@ const uint8_t *swb_size_1024[] = { swb_size_1024_8 }; -const int swb_size_128_len = FF_ARRAY_ELEMS(swb_size_128); -const int swb_size_1024_len = FF_ARRAY_ELEMS(swb_size_1024); +const int swb_size_128_len = FF_ARRAY_ELEMS(ff_aac_swb_size_128); +const int swb_size_1024_len = FF_ARRAY_ELEMS(ff_aac_swb_size_1024); diff --git a/libavcodec/aacenctab.h b/libavcodec/aacenctab.h index 25c523ee40..7e14a195d2 100644 --- a/libavcodec/aacenctab.h +++ b/libavcodec/aacenctab.h @@ -38,10 +38,10 @@ #define AAC_MAX_CHANNELS 6 -extern const uint8_t *swb_size_1024[]; -extern const int swb_size_1024_len; -extern const uint8_t *swb_size_128[]; -extern const int swb_size_128_len; +extern const uint8_t *ff_aac_swb_size_1024[]; +extern const int ff_aac_swb_size_1024_len; +extern const uint8_t *ff_aac_swb_size_128[]; +extern const int ff_aac_swb_size_128_len; /** default channel configurations */ static const uint8_t aac_chan_configs[6][5] = { |