Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Add ff_ prefix to vorbis_comment

Browse source 
Originally committed as revision 22472 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-03-12 05:16:39 +00:00
parent 2972e36e27
commit e4d2d8c5d7
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libavformat/flacdec.c
View file

@ -113,7 +113,7 @@ static int flac_read_header(AVFormatContext *s,
} }
/* process supported blocks other than STREAMINFO */ /* process supported blocks other than STREAMINFO */
if (metadata_type == FLAC_METADATA_TYPE_VORBIS_COMMENT) { 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"); av_log(s, AV_LOG_WARNING, "error parsing VorbisComment metadata\n");
} }
} }

2
libavformat/oggdec.h
View file

@ -115,7 +115,7 @@ extern const struct ogg_codec ff_vorbis_codec;
extern const AVMetadataConv ff_vorbiscomment_metadata_conv[]; 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 static inline int
ogg_find_stream (struct ogg * ogg, int serial) ogg_find_stream (struct ogg * ogg, int serial)

2
libavformat/oggparseflac.c
View file

@ -68,7 +68,7 @@ flac_header (AVFormatContext * s, int idx)
st->time_base.num = 1; st->time_base.num = 1;
st->time_base.den = st->codec->sample_rate; st->time_base.den = st->codec->sample_rate;
} else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) { } 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; return 1;

2
libavformat/oggparsespeex.c
View file

@ -75,7 +75,7 @@ static int speex_header(AVFormatContext *s, int idx) {
st->time_base.num = 1; st->time_base.num = 1;
st->time_base.den = st->codec->sample_rate; st->time_base.den = st->codec->sample_rate;
} else } else
vorbis_comment(s, p, os->psize); ff_vorbis_comment(s, p, os->psize);
spxp->seq++; spxp->seq++;
return 1; return 1;

2
libavformat/oggparsetheora.c
View file

@ -109,7 +109,7 @@ theora_header (AVFormatContext * s, int idx)
st->need_parsing = AVSTREAM_PARSE_HEADERS; st->need_parsing = AVSTREAM_PARSE_HEADERS;
} else if (os->buf[os->pstart] == 0x83) { } 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, st->codec->extradata = av_realloc (st->codec->extradata,

4
libavformat/oggparsevorbis.c
View file

@ -42,7 +42,7 @@ const AVMetadataConv ff_vorbiscomment_metadata_conv[] = {
}; };
int 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 *p = buf;
const uint8_t *end = buf + size; const uint8_t *end = buf + size;
@ -220,7 +220,7 @@ vorbis_header (AVFormatContext * s, int idx)
st->time_base.den = st->codec->sample_rate; st->time_base.den = st->codec->sample_rate;
} else if (os->buf[os->pstart] == 3) { } else if (os->buf[os->pstart] == 3) {
if (os->psize > 8) 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 { } else {
st->codec->extradata_size = st->codec->extradata_size =
fixup_vorbis_headers(s, priv, &st->codec->extradata); fixup_vorbis_headers(s, priv, &st->codec->extradata);