| @@ -35,7 +35,7 @@ static const uint8_t eac3_blocks[4] = { | |||||
| }; | }; | ||||
| int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) | |||||
| int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) | |||||
| { | { | ||||
| int frame_size_code; | int frame_size_code; | ||||
| @@ -141,7 +141,7 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info, | |||||
| GetBitContext gbc; | GetBitContext gbc; | ||||
| init_get_bits(&gbc, tmp.u8+8-AC3_HEADER_SIZE, 54); | init_get_bits(&gbc, tmp.u8+8-AC3_HEADER_SIZE, 54); | ||||
| err = ff_ac3_parse_header(&gbc, &hdr); | |||||
| err = avpriv_ac3_parse_header(&gbc, &hdr); | |||||
| if(err < 0) | if(err < 0) | ||||
| return 0; | return 0; | ||||
| @@ -36,6 +36,6 @@ | |||||
| * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate) | * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate) | ||||
| * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid. | * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid. | ||||
| */ | */ | ||||
| int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr); | |||||
| int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr); | |||||
| #endif /* AVCODEC_AC3_PARSER_H */ | #endif /* AVCODEC_AC3_PARSER_H */ | ||||
| @@ -261,7 +261,7 @@ static int parse_frame_header(AC3DecodeContext *s) | |||||
| AC3HeaderInfo hdr; | AC3HeaderInfo hdr; | ||||
| int err; | int err; | ||||
| err = ff_ac3_parse_header(&s->gbc, &hdr); | |||||
| err = avpriv_ac3_parse_header(&s->gbc, &hdr); | |||||
| if(err) | if(err) | ||||
| return err; | return err; | ||||
| @@ -41,7 +41,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id) | |||||
| for(frames = 0; buf2 < end; frames++) { | for(frames = 0; buf2 < end; frames++) { | ||||
| init_get_bits(&gbc, buf2, 54); | init_get_bits(&gbc, buf2, 54); | ||||
| if(ff_ac3_parse_header(&gbc, &hdr) < 0) | |||||
| if(avpriv_ac3_parse_header(&gbc, &hdr) < 0) | |||||
| break; | break; | ||||
| if(buf2 + hdr.frame_size > end || | if(buf2 + hdr.frame_size > end || | ||||
| av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, buf2 + 2, hdr.frame_size - 2)) | av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, buf2 + 2, hdr.frame_size - 2)) | ||||