diff options
author | David Conrad <lessen42@gmail.com> | 2010-03-12 05:16:39 +0000 |
---|---|---|
committer | David Conrad <lessen42@gmail.com> | 2010-03-12 05:16:39 +0000 |
commit | e4d2d8c5d720d84997a24178acd9553f23077c03 (patch) | |
tree | 460f8bb817ce883b14a1ddab3d88cd73f73892c8 | |
parent | 2972e36e274ee251711d229d5aa85b55b2d35f66 (diff) | |
download | ffmpeg-e4d2d8c5d720d84997a24178acd9553f23077c03.tar.gz |
Add ff_ prefix to vorbis_comment
Originally committed as revision 22472 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavformat/flacdec.c | 2 | ||||
-rw-r--r-- | libavformat/oggdec.h | 2 | ||||
-rw-r--r-- | libavformat/oggparseflac.c | 2 | ||||
-rw-r--r-- | libavformat/oggparsespeex.c | 2 | ||||
-rw-r--r-- | libavformat/oggparsetheora.c | 2 | ||||
-rw-r--r-- | libavformat/oggparsevorbis.c | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 067d4fafe9..d7f1e715d8 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 8733d411b2..739e4ca346 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 b524da17ee..36b2345aa6 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 395ae59377..05a998b228 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 edb823ef5c..4cbb62a169 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 b491b6d291..6b69b655a7 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); |