[FFmpeg-cvslog] 10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Sun Dec 30 22:54:53 2012 +0100| [67286fa98b1ebbf005de784b47852f8d429d03c8] | committer: Clément Bœsch

10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.

Both libavformat and libavcodec requires this function.

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

 libavcodec/dvdsubenc.c     |    2 +-
 libavcodec/internal.h      |    2 +-
 libavcodec/utils.c         |    2 +-
 libavformat/assdec.c       |    2 +-
 libavformat/jacosubdec.c   |    2 +-
 libavformat/samidec.c      |    2 +-
 libavformat/subviewerdec.c |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index 352272d..bf54aa2 100644
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -409,7 +409,7 @@ static int dvdsub_init(AVCodecContext *avctx)
         av_bprintf(&extradata, " %06"PRIx32"%c",
                    dvdc->global_palette[i] & 0xFFFFFF, i < 15 ? ',' : '\n');
 
-    ret = ff_bprint_to_extradata(avctx, &extradata);
+    ret = avpriv_bprint_to_extradata(avctx, &extradata);
     if (ret < 0)
         return ret;
 
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 386f6f3..cf8bbe5 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -204,6 +204,6 @@ int ff_codec_close_recursive(AVCodecContext *avctx);
 /**
  * Finalize buf into extradata and set its size appropriately.
  */
-int ff_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf);
+int avpriv_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf);
 
 #endif /* AVCODEC_INTERNAL_H */
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a275899..738fb29 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -2686,7 +2686,7 @@ int avcodec_is_open(AVCodecContext *s)
     return !!s->internal;
 }
 
-int ff_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf)
+int avpriv_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf)
 {
     int ret;
     char *str;
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 34229cb..35fcb51 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -133,7 +133,7 @@ static int ass_read_header(AVFormatContext *s)
 
     av_bprint_finalize(&line, NULL);
 
-    res = ff_bprint_to_extradata(st->codec, &header);
+    res = avpriv_bprint_to_extradata(st->codec, &header);
     if (res < 0)
         goto end;
 
diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c
index 153da42..f45b40b 100644
--- a/libavformat/jacosubdec.c
+++ b/libavformat/jacosubdec.c
@@ -229,7 +229,7 @@ static int jacosub_read_header(AVFormatContext *s)
     }
 
     /* general/essential directives in the extradata */
-    ret = ff_bprint_to_extradata(st->codec, &header);
+    ret = avpriv_bprint_to_extradata(st->codec, &header);
     if (ret < 0)
         return ret;
 
diff --git a/libavformat/samidec.c b/libavformat/samidec.c
index bdde2f4..332752c 100644
--- a/libavformat/samidec.c
+++ b/libavformat/samidec.c
@@ -92,7 +92,7 @@ static int sami_read_header(AVFormatContext *s)
         av_bprint_clear(&buf);
     }
 
-    res = ff_bprint_to_extradata(st->codec, &hdr_buf);
+    res = avpriv_bprint_to_extradata(st->codec, &hdr_buf);
     if (res < 0)
         goto end;
 
diff --git a/libavformat/subviewerdec.c b/libavformat/subviewerdec.c
index 8ecc928..ac3a06a 100644
--- a/libavformat/subviewerdec.c
+++ b/libavformat/subviewerdec.c
@@ -100,7 +100,7 @@ static int subviewer_read_header(AVFormatContext *s)
                 av_bprintf(&header, "%s", line);
                 if (!strncmp(line, "[END INFORMATION]", 17) || !strncmp(line, "[SUBTITLE]", 10)) {
                     /* end of header */
-                    res = ff_bprint_to_extradata(st->codec, &header);
+                    res = avpriv_bprint_to_extradata(st->codec, &header);
                     if (res < 0)
                         goto end;
                 } else if (strncmp(line, "[INFORMATION]", 13)) {