From 357db4c263bb7edfd9790414f0f378e752f924e9 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 17 Oct 2011 09:45:27 +0200
Subject: [PATCH] lavc: use avpriv_ prefix for ff_split_xiph_headers.

It's used in lavf.
---
 libavcodec/vorbisdec.c    | 2 +-
 libavcodec/vp3.c          | 2 +-
 libavcodec/xiph.c         | 2 +-
 libavcodec/xiph.h         | 6 +++---
 libavformat/matroskaenc.c | 2 +-
 libavformat/oggenc.c      | 2 +-
 libavformat/sdp.c         | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 7c07de6..2662a6c 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -987,7 +987,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext)
         return -1;
     }
 
-    if (ff_split_xiph_headers(headers, headers_len, 30, header_start, header_len) < 0) {
+    if (avpriv_split_xiph_headers(headers, headers_len, 30, header_start, header_len) < 0) {
         av_log(avccontext, AV_LOG_ERROR, "Extradata corrupt.\n");
         return -1;
     }
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 9262c27..36715bb 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2275,7 +2275,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
         return -1;
     }
 
-    if (ff_split_xiph_headers(avctx->extradata, avctx->extradata_size,
+    if (avpriv_split_xiph_headers(avctx->extradata, avctx->extradata_size,
                               42, header_start, header_len) < 0) {
         av_log(avctx, AV_LOG_ERROR, "Corrupt extradata\n");
         return -1;
diff --git a/libavcodec/xiph.c b/libavcodec/xiph.c
index 0bcfd45..7c3c710 100644
--- a/libavcodec/xiph.c
+++ b/libavcodec/xiph.c
@@ -21,7 +21,7 @@
 #include "libavutil/intreadwrite.h"
 #include "xiph.h"
 
-int ff_split_xiph_headers(uint8_t *extradata, int extradata_size,
+int avpriv_split_xiph_headers(uint8_t *extradata, int extradata_size,
                           int first_header_size, uint8_t *header_start[3],
                           int header_len[3])
 {
diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h
index da18c9c..afaece7 100644
--- a/libavcodec/xiph.h
+++ b/libavcodec/xiph.h
@@ -36,8 +36,8 @@
  * @param[out] header_len The sizes of each of the three headers.
  * @return On error a negative value is returned, on success zero.
  */
-int ff_split_xiph_headers(uint8_t *extradata, int extradata_size,
-                          int first_header_size, uint8_t *header_start[3],
-                          int header_len[3]);
+int avpriv_split_xiph_headers(uint8_t *extradata, int extradata_size,
+                              int first_header_size, uint8_t *header_start[3],
+                              int header_len[3]);
 
 #endif /* AVCODEC_XIPH_H */
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index a35a2fa..1adb479 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -423,7 +423,7 @@ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecContex
     else
         first_header_size = 42;
 
-    if (ff_split_xiph_headers(codec->extradata, codec->extradata_size,
+    if (avpriv_split_xiph_headers(codec->extradata, codec->extradata_size,
                               first_header_size, header_start, header_len) < 0) {
         av_log(s, AV_LOG_ERROR, "Extradata corrupt.\n");
         return -1;
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index d554b07..7549b3a 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -377,7 +377,7 @@ static int ogg_write_header(AVFormatContext *s)
             int header_type = st->codec->codec_id == CODEC_ID_VORBIS ? 3 : 0x81;
             int framing_bit = st->codec->codec_id == CODEC_ID_VORBIS ? 1 : 0;
 
-            if (ff_split_xiph_headers(st->codec->extradata, st->codec->extradata_size,
+            if (avpriv_split_xiph_headers(st->codec->extradata, st->codec->extradata_size,
                                       st->codec->codec_id == CODEC_ID_VORBIS ? 30 : 42,
                                       oggstream->header, oggstream->header_len) < 0) {
                 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n");
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 5adf14d..ba3d4dd 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -252,7 +252,7 @@ static char *xiph_extradata2config(AVCodecContext *c)
         return NULL;
     }
 
-    if (ff_split_xiph_headers(c->extradata, c->extradata_size,
+    if (avpriv_split_xiph_headers(c->extradata, c->extradata_size,
                               first_header_size, header_start,
                               header_len) < 0) {
         av_log(c, AV_LOG_ERROR, "Extradata corrupt.\n");
-- 
2.7.4