[SCM] libav/experimental: Add ff_ prefix to vorbis_comment

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e4d2d8c5d720d84997a24178acd9553f23077c03
Author: David Conrad <lessen42 at gmail.com>
Date:   Fri Mar 12 05:16:39 2010 +0000

    Add ff_ prefix to vorbis_comment
    
    Originally committed as revision 22472 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index 067d4fa..d7f1e71 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -113,7 +113,7 @@ static int flac_read_header(AVFormatContext *s,
             }
             /* process supported blocks other than STREAMINFO */
             if (metadata_type == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
-                if (vorbis_comment(s, buffer, metadata_size)) {
+                if (ff_vorbis_comment(s, buffer, metadata_size)) {
                     av_log(s, AV_LOG_WARNING, "error parsing VorbisComment metadata\n");
                 }
             }
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index 8733d41..739e4ca 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -115,7 +115,7 @@ extern const struct ogg_codec ff_vorbis_codec;
 
 extern const AVMetadataConv ff_vorbiscomment_metadata_conv[];
 
-int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
+int ff_vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 
 static inline int
 ogg_find_stream (struct ogg * ogg, int serial)
diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index b524da1..36b2345 100644
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -68,7 +68,7 @@ flac_header (AVFormatContext * s, int idx)
         st->time_base.num = 1;
         st->time_base.den = st->codec->sample_rate;
     } else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
-        vorbis_comment (s, os->buf + os->pstart + 4, os->psize - 4);
+        ff_vorbis_comment (s, os->buf + os->pstart + 4, os->psize - 4);
     }
 
     return 1;
diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index 395ae59..05a998b 100644
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -75,7 +75,7 @@ static int speex_header(AVFormatContext *s, int idx) {
         st->time_base.num = 1;
         st->time_base.den = st->codec->sample_rate;
     } else
-        vorbis_comment(s, p, os->psize);
+        ff_vorbis_comment(s, p, os->psize);
 
     spxp->seq++;
     return 1;
diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c
index edb823e..4cbb62a 100644
--- a/libavformat/oggparsetheora.c
+++ b/libavformat/oggparsetheora.c
@@ -109,7 +109,7 @@ theora_header (AVFormatContext * s, int idx)
         st->need_parsing = AVSTREAM_PARSE_HEADERS;
 
     } else if (os->buf[os->pstart] == 0x83) {
-        vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
+        ff_vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
     }
 
     st->codec->extradata = av_realloc (st->codec->extradata,
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index b491b6d..6b69b65 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -42,7 +42,7 @@ const AVMetadataConv ff_vorbiscomment_metadata_conv[] = {
 };
 
 int
-vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
+ff_vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
 {
     const uint8_t *p = buf;
     const uint8_t *end = buf + size;
@@ -220,7 +220,7 @@ vorbis_header (AVFormatContext * s, int idx)
         st->time_base.den = st->codec->sample_rate;
     } else if (os->buf[os->pstart] == 3) {
         if (os->psize > 8)
-            vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
+            ff_vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
     } else {
         st->codec->extradata_size =
             fixup_vorbis_headers(s, priv, &st->codec->extradata);

-- 
Libav/FFmpeg packaging