Browse code

lavc: use avpriv_ prefix for ff_ac3_parse_header.

It's used in lavf.

Anton Khirnov authored on 2011/10/17 17:04:12
Showing 4 changed files
... ...
@@ -35,7 +35,7 @@ static const uint8_t eac3_blocks[4] = {
35 35
 };
36 36
 
37 37
 
38
-int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr)
38
+int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr)
39 39
 {
40 40
     int frame_size_code;
41 41
 
... ...
@@ -141,7 +141,7 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info,
141 141
     GetBitContext gbc;
142 142
 
143 143
     init_get_bits(&gbc, tmp.u8+8-AC3_HEADER_SIZE, 54);
144
-    err = ff_ac3_parse_header(&gbc, &hdr);
144
+    err = avpriv_ac3_parse_header(&gbc, &hdr);
145 145
 
146 146
     if(err < 0)
147 147
         return 0;
... ...
@@ -36,6 +36,6 @@
36 36
  * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate)
37 37
  * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid.
38 38
  */
39
-int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr);
39
+int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr);
40 40
 
41 41
 #endif /* AVCODEC_AC3_PARSER_H */
... ...
@@ -261,7 +261,7 @@ static int parse_frame_header(AC3DecodeContext *s)
261 261
     AC3HeaderInfo hdr;
262 262
     int err;
263 263
 
264
-    err = ff_ac3_parse_header(&s->gbc, &hdr);
264
+    err = avpriv_ac3_parse_header(&s->gbc, &hdr);
265 265
     if(err)
266 266
         return err;
267 267
 
... ...
@@ -41,7 +41,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id)
41 41
 
42 42
         for(frames = 0; buf2 < end; frames++) {
43 43
             init_get_bits(&gbc, buf2, 54);
44
-            if(ff_ac3_parse_header(&gbc, &hdr) < 0)
44
+            if(avpriv_ac3_parse_header(&gbc, &hdr) < 0)
45 45
                 break;
46 46
             if(buf2 + hdr.frame_size > end ||
47 47
                av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, buf2 + 2, hdr.frame_size - 2))