| @@ -55,7 +55,7 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc, | |||||
| if (show_bits(&gb, 12) != 0xfff) | if (show_bits(&gb, 12) != 0xfff) | ||||
| return 0; | return 0; | ||||
| if (ff_aac_parse_header(&gb, &hdr) < 0) { | |||||
| if (avpriv_aac_parse_header(&gb, &hdr) < 0) { | |||||
| av_log(avctx, AV_LOG_ERROR, "Error parsing ADTS frame header!\n"); | av_log(avctx, AV_LOG_ERROR, "Error parsing ADTS frame header!\n"); | ||||
| return -1; | return -1; | ||||
| } | } | ||||
| @@ -40,7 +40,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, | |||||
| tmp.u64 = av_be2ne64(state); | tmp.u64 = av_be2ne64(state); | ||||
| init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8); | init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8); | ||||
| if ((size = ff_aac_parse_header(&bits, &hdr)) < 0) | |||||
| if ((size = avpriv_aac_parse_header(&bits, &hdr)) < 0) | |||||
| return 0; | return 0; | ||||
| *need_next_header = 0; | *need_next_header = 0; | ||||
| *new_frame_start = 1; | *new_frame_start = 1; | ||||
| @@ -26,7 +26,7 @@ | |||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "mpeg4audio.h" | #include "mpeg4audio.h" | ||||
| int ff_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr) | |||||
| int avpriv_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr) | |||||
| { | { | ||||
| int size, rdb, ch, sr; | int size, rdb, ch, sr; | ||||
| int aot, crc_abs; | int aot, crc_abs; | ||||
| @@ -49,6 +49,6 @@ typedef struct { | |||||
| * -2 if the version element is invalid, -3 if the sample rate | * -2 if the version element is invalid, -3 if the sample rate | ||||
| * element is invalid, or -4 if the bit rate element is invalid. | * element is invalid, or -4 if the bit rate element is invalid. | ||||
| */ | */ | ||||
| int ff_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr); | |||||
| int avpriv_aac_parse_header(GetBitContext *gbc, AACADTSHeaderInfo *hdr); | |||||
| #endif /* AVCODEC_AACADTSDEC_H */ | #endif /* AVCODEC_AACADTSDEC_H */ | ||||
| @@ -2075,7 +2075,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) | |||||
| int size; | int size; | ||||
| AACADTSHeaderInfo hdr_info; | AACADTSHeaderInfo hdr_info; | ||||
| size = ff_aac_parse_header(gb, &hdr_info); | |||||
| size = avpriv_aac_parse_header(gb, &hdr_info); | |||||
| if (size > 0) { | if (size > 0) { | ||||
| if (ac->output_configured != OC_LOCKED && hdr_info.chan_config) { | if (ac->output_configured != OC_LOCKED && hdr_info.chan_config) { | ||||
| enum ChannelPosition new_che_pos[4][MAX_ELEM_ID]; | enum ChannelPosition new_che_pos[4][MAX_ELEM_ID]; | ||||
| @@ -57,7 +57,7 @@ static int spdif_get_offset_and_codec(AVFormatContext *s, | |||||
| break; | break; | ||||
| case IEC61937_MPEG2_AAC: | case IEC61937_MPEG2_AAC: | ||||
| init_get_bits(&gbc, buf, AAC_ADTS_HEADER_SIZE * 8); | init_get_bits(&gbc, buf, AAC_ADTS_HEADER_SIZE * 8); | ||||
| if (ff_aac_parse_header(&gbc, &aac_hdr)) { | |||||
| if (avpriv_aac_parse_header(&gbc, &aac_hdr)) { | |||||
| if (s) /* be silent during a probe */ | if (s) /* be silent during a probe */ | ||||
| av_log(s, AV_LOG_ERROR, "Invalid AAC packet in IEC 61937\n"); | av_log(s, AV_LOG_ERROR, "Invalid AAC packet in IEC 61937\n"); | ||||
| return AVERROR_INVALIDDATA; | return AVERROR_INVALIDDATA; | ||||
| @@ -349,7 +349,7 @@ static int spdif_header_aac(AVFormatContext *s, AVPacket *pkt) | |||||
| int ret; | int ret; | ||||
| init_get_bits(&gbc, pkt->data, AAC_ADTS_HEADER_SIZE * 8); | init_get_bits(&gbc, pkt->data, AAC_ADTS_HEADER_SIZE * 8); | ||||
| ret = ff_aac_parse_header(&gbc, &hdr); | |||||
| ret = avpriv_aac_parse_header(&gbc, &hdr); | |||||
| if (ret < 0) { | if (ret < 0) { | ||||
| av_log(s, AV_LOG_ERROR, "Wrong AAC file format\n"); | av_log(s, AV_LOG_ERROR, "Wrong AAC file format\n"); | ||||
| return AVERROR_INVALIDDATA; | return AVERROR_INVALIDDATA; | ||||