[FFmpeg-cvslog] lavc: use avpriv_ prefix for ff_aac_parse_header().

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Oct 17 09:22:04 2011 +0200| [73ae27e17be5fd0a4e34e7ea8a449ca59bc09664] | committer: Anton Khirnov

lavc: use avpriv_ prefix for ff_aac_parse_header().

It's used in lavf.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73ae27e17be5fd0a4e34e7ea8a449ca59bc09664
---

 libavcodec/aac_adtstoasc_bsf.c |    2 +-
 libavcodec/aac_parser.c        |    2 +-
 libavcodec/aacadtsdec.c        |    2 +-
 libavcodec/aacadtsdec.h        |    2 +-
 libavcodec/aacdec.c            |    2 +-
 libavformat/spdifdec.c         |    2 +-
 libavformat/spdifenc.c         |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c
index d1310c4..be12e99 100644
--- a/libavcodec/aac_adtstoasc_bsf.c
+++ b/libavcodec/aac_adtstoasc_bsf.c
@@ -55,7 +55,7 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc,
         if (show_bits(&gb, 12) != 0xfff)
             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");
         return -1;
     }
diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index 1c5546e..ca016d1 100644
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -40,7 +40,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
     tmp.u64 = av_be2ne64(state);
     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;
     *need_next_header = 0;
     *new_frame_start  = 1;
diff --git a/libavcodec/aacadtsdec.c b/libavcodec/aacadtsdec.c
index a9ff8ef..09bf139 100644
--- a/libavcodec/aacadtsdec.c
+++ b/libavcodec/aacadtsdec.c
@@ -26,7 +26,7 @@
 #include "get_bits.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 aot, crc_abs;
diff --git a/libavcodec/aacadtsdec.h b/libavcodec/aacadtsdec.h
index 2fa1b4b..60fdd22 100644
--- a/libavcodec/aacadtsdec.h
+++ b/libavcodec/aacadtsdec.h
@@ -49,6 +49,6 @@ typedef struct {
  * -2 if the version element is invalid, -3 if the sample rate
  * 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 */
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 8e7e74e..d03363d 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2075,7 +2075,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
     int size;
     AACADTSHeaderInfo hdr_info;
 
-    size = ff_aac_parse_header(gb, &hdr_info);
+    size = avpriv_aac_parse_header(gb, &hdr_info);
     if (size > 0) {
         if (ac->output_configured != OC_LOCKED && hdr_info.chan_config) {
             enum ChannelPosition new_che_pos[4][MAX_ELEM_ID];
diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c
index 0cbbc54..3daf23f 100644
--- a/libavformat/spdifdec.c
+++ b/libavformat/spdifdec.c
@@ -57,7 +57,7 @@ static int spdif_get_offset_and_codec(AVFormatContext *s,
         break;
     case IEC61937_MPEG2_AAC:
         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 */
                 av_log(s, AV_LOG_ERROR, "Invalid AAC packet in IEC 61937\n");
             return AVERROR_INVALIDDATA;
diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c
index 9e57151..d541aba 100644
--- a/libavformat/spdifenc.c
+++ b/libavformat/spdifenc.c
@@ -349,7 +349,7 @@ static int spdif_header_aac(AVFormatContext *s, AVPacket *pkt)
     int ret;
 
     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) {
         av_log(s, AV_LOG_ERROR, "Wrong AAC file format\n");
         return AVERROR_INVALIDDATA;