Browse Source

lavc: use avpriv_ prefix for ff_ac3_parse_header.

It's used in lavf.
tags/n0.9
Anton Khirnov 14 years ago
parent
commit
6f89efeaa7
4 changed files with 5 additions and 5 deletions
  1. +2
    -2
      libavcodec/ac3_parser.c
  2. +1
    -1
      libavcodec/ac3_parser.h
  3. +1
    -1
      libavcodec/ac3dec.c
  4. +1
    -1
      libavformat/ac3dec.c

+ 2
- 2
libavcodec/ac3_parser.c View File

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

@@ -141,7 +141,7 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info,
GetBitContext gbc;

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)
return 0;


+ 1
- 1
libavcodec/ac3_parser.h View File

@@ -36,6 +36,6 @@
* -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.
*/
int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr);
int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr);

#endif /* AVCODEC_AC3_PARSER_H */

+ 1
- 1
libavcodec/ac3dec.c View File

@@ -261,7 +261,7 @@ static int parse_frame_header(AC3DecodeContext *s)
AC3HeaderInfo hdr;
int err;

err = ff_ac3_parse_header(&s->gbc, &hdr);
err = avpriv_ac3_parse_header(&s->gbc, &hdr);
if(err)
return err;



+ 1
- 1
libavformat/ac3dec.c View File

@@ -41,7 +41,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id)

for(frames = 0; buf2 < end; frames++) {
init_get_bits(&gbc, buf2, 54);
if(ff_ac3_parse_header(&gbc, &hdr) < 0)
if(avpriv_ac3_parse_header(&gbc, &hdr) < 0)
break;
if(buf2 + hdr.frame_size > end ||
av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, buf2 + 2, hdr.frame_size - 2))


Loading…
Cancel
Save