# HG changeset patch
# User conrad
# Date 1268370999 0
# Node ID e3830094915a7d2447af7f01c10ffa78cc719906
# Parent  528440939c065e7d7b92a50190b124f4db8c0708
Add ff_ prefix to vorbis_comment

diff -r 528440939c06 -r e3830094915a flacdec.c
--- a/flacdec.c	Thu Mar 11 16:26:14 2010 +0000
+++ b/flacdec.c	Fri Mar 12 05:16:39 2010 +0000
@@ -113,7 +113,7 @@
             }
             /* 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 -r 528440939c06 -r e3830094915a oggdec.h
--- a/oggdec.h	Thu Mar 11 16:26:14 2010 +0000
+++ b/oggdec.h	Fri Mar 12 05:16:39 2010 +0000
@@ -115,7 +115,7 @@
 
 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 -r 528440939c06 -r e3830094915a oggparseflac.c
--- a/oggparseflac.c	Thu Mar 11 16:26:14 2010 +0000
+++ b/oggparseflac.c	Fri Mar 12 05:16:39 2010 +0000
@@ -68,7 +68,7 @@
         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 -r 528440939c06 -r e3830094915a oggparsespeex.c
--- a/oggparsespeex.c	Thu Mar 11 16:26:14 2010 +0000
+++ b/oggparsespeex.c	Fri Mar 12 05:16:39 2010 +0000
@@ -75,7 +75,7 @@
         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 -r 528440939c06 -r e3830094915a oggparsetheora.c
--- a/oggparsetheora.c	Thu Mar 11 16:26:14 2010 +0000
+++ b/oggparsetheora.c	Fri Mar 12 05:16:39 2010 +0000
@@ -109,7 +109,7 @@
         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 -r 528440939c06 -r e3830094915a oggparsevorbis.c
--- a/oggparsevorbis.c	Thu Mar 11 16:26:14 2010 +0000
+++ b/oggparsevorbis.c	Fri Mar 12 05:16:39 2010 +0000
@@ -42,7 +42,7 @@
 };
 
 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 @@
         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);