aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-10-17 10:04:12 +0200
committerAnton Khirnov <anton@khirnov.net>2011-10-20 21:06:58 +0200
commit6f89efeaa7eceb3408abb6e593d892ec819177a7 (patch)
tree44baa4c757b971613eb97716c0898c4dcb2ca5a2
parent9138a130cd69e6828da5796a0555eac5a0af2357 (diff)
downloadffmpeg-6f89efeaa7eceb3408abb6e593d892ec819177a7.tar.gz
lavc: use avpriv_ prefix for ff_ac3_parse_header.
It's used in lavf.
-rw-r--r--libavcodec/ac3_parser.c4
-rw-r--r--libavcodec/ac3_parser.h2
-rw-r--r--libavcodec/ac3dec.c2
-rw-r--r--libavformat/ac3dec.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
index 82eeda3e61..a6bdd5490f 100644
--- a/libavcodec/ac3_parser.c
+++ b/libavcodec/ac3_parser.c
@@ -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;
diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h
index d62490bc77..9322550ea5 100644
--- a/libavcodec/ac3_parser.h
+++ b/libavcodec/ac3_parser.h
@@ -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 */
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 86a4fd5cc0..134e0b5d11 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -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;
diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c
index 2cb068e57c..ca6aee3685 100644
--- a/libavformat/ac3dec.c
+++ b/libavformat/ac3dec.c
@@ -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))