From d9cca9fc6a4796c0a4235b25f5f7fd7191813f3a Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 17 Oct 2011 09:28:53 +0200
Subject: lavc: use avpriv_ prefix for some flac symbols used in lavf.

Specifically, ff_flac_parse_streaminfo, ff_flac_is_extradata_valid and
ff_flac_parse_block_header
---
 libavformat/flacdec.c        | 4 ++--
 libavformat/flacenc.c        | 2 +-
 libavformat/flacenc_header.c | 2 +-
 libavformat/oggenc.c         | 2 +-
 libavformat/oggparseflac.c   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libavformat')

diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index e6098adf4a..41912854b7 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -48,7 +48,7 @@ static int flac_read_header(AVFormatContext *s,
     /* process metadata blocks */
     while (!s->pb->eof_reached && !metadata_last) {
         avio_read(s->pb, header, 4);
-        ff_flac_parse_block_header(header, &metadata_last, &metadata_type,
+        avpriv_flac_parse_block_header(header, &metadata_last, &metadata_type,
                                    &metadata_size);
         switch (metadata_type) {
         /* allocate and read metadata block for supported types */
@@ -87,7 +87,7 @@ static int flac_read_header(AVFormatContext *s,
             buffer = NULL;
 
             /* get codec params from STREAMINFO header */
-            ff_flac_parse_streaminfo(st->codec, &si, st->codec->extradata);
+            avpriv_flac_parse_streaminfo(st->codec, &si, st->codec->extradata);
 
             /* set time base and duration */
             if (si.samplerate > 0) {
diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c
index f14b30b0c5..00e89002fe 100644
--- a/libavformat/flacenc.c
+++ b/libavformat/flacenc.c
@@ -94,7 +94,7 @@ static int flac_write_trailer(struct AVFormatContext *s)
     enum FLACExtradataFormat format;
     int64_t file_size;
 
-    if (!ff_flac_is_extradata_valid(s->streams[0]->codec, &format, &streaminfo))
+    if (!avpriv_flac_is_extradata_valid(s->streams[0]->codec, &format, &streaminfo))
         return -1;
 
     if (pb->seekable) {
diff --git a/libavformat/flacenc_header.c b/libavformat/flacenc_header.c
index 90c5a776d3..ad8d55b380 100644
--- a/libavformat/flacenc_header.c
+++ b/libavformat/flacenc_header.c
@@ -34,7 +34,7 @@ int ff_flac_write_header(AVIOContext *pb, AVCodecContext *codec,
     enum FLACExtradataFormat format;
 
     header[4] = last_block ? 0x80 : 0x00;
-    if (!ff_flac_is_extradata_valid(codec, &format, &streaminfo))
+    if (!avpriv_flac_is_extradata_valid(codec, &format, &streaminfo))
         return -1;
 
     /* write "fLaC" stream marker and first metadata block header if needed */
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 49dedb35d7..d554b07c5b 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -254,7 +254,7 @@ static int ogg_build_flac_headers(AVCodecContext *avctx,
     uint8_t *streaminfo;
     uint8_t *p;
 
-    if (!ff_flac_is_extradata_valid(avctx, &format, &streaminfo))
+    if (!avpriv_flac_is_extradata_valid(avctx, &format, &streaminfo))
         return -1;
 
     // first packet: STREAMINFO
diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index 53cd0fa582..e5f517fbdb 100644
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -55,7 +55,7 @@ flac_header (AVFormatContext * s, int idx)
         if (get_bits_long(&gb, 32) != FLAC_STREAMINFO_SIZE)
             return -1;
 
-        ff_flac_parse_streaminfo(st->codec, &si, streaminfo_start);
+        avpriv_flac_parse_streaminfo(st->codec, &si, streaminfo_start);
 
         st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
         st->codec->codec_id = CODEC_ID_FLAC;
-- 
cgit v1.2.3