Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

aacenctab: Add missing ff_ prefixes

Browse Source 
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
pull/146/head
Timothy Gu 10 years ago committed by Rostislav Pehlivanov
parent 5cbcf2b24d
commit 15ebc7787c
3 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavcodec/aacenc.c
  2. 8
      libavcodec/aacenctab.c
  3. 8
      libavcodec/aacenctab.h

6
libavcodec/aacenc.c
Unescape View File

@ -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++)

8
libavcodec/aacenctab.c
Unescape View File

@ -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);

8
libavcodec/aacenctab.h
Unescape View File

@ -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] = {

Write Preview
Loading…
Cancel
Save