diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-10-17 09:28:53 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-20 21:06:57 +0200 |
| commit | 59a9a235811dc5f6a2c8b631a320968a06a867d1 (patch) | |
| tree | 48ff43883a93962dd8808b5b94b7654c41b428ce /libavcodec/aacadtsdec.c | |
| parent | 82ab61f9015659419e0a2766ee031c367e3f2908 (diff) | |
| download | ffmpeg-59a9a235811dc5f6a2c8b631a320968a06a867d1.tar.gz | |
lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and
ff_copy_pce_data
Diffstat (limited to 'libavcodec/aacadtsdec.c')
| -rw-r--r-- | libavcodec/aacadtsdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacadtsdec.c b/libavcodec/aacadtsdec.c index 09bf1392c4..30f92e0b10 100644 --- a/libavcodec/aacadtsdec.c +++ b/libavcodec/aacadtsdec.c @@ -39,7 +39,7 @@ int avpriv_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr) crc_abs = get_bits1(gbc); /* protection_absent */ aot = get_bits(gbc, 2); /* profile_objecttype */ sr = get_bits(gbc, 4); /* sample_frequency_index */ - if(!ff_mpeg4audio_sample_rates[sr]) + if(!avpriv_mpeg4audio_sample_rates[sr]) return AAC_AC3_PARSE_ERROR_SAMPLE_RATE; skip_bits1(gbc); /* private_bit */ ch = get_bits(gbc, 3); /* channel_configuration */ @@ -62,7 +62,7 @@ int avpriv_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr) hdr->crc_absent = crc_abs; hdr->num_aac_frames = rdb + 1; hdr->sampling_index = sr; - hdr->sample_rate = ff_mpeg4audio_sample_rates[sr]; + hdr->sample_rate = avpriv_mpeg4audio_sample_rates[sr]; hdr->samples = (rdb + 1) * 1024; hdr->bit_rate = size * 8 * hdr->sample_rate / hdr->samples; |