[FFmpeg-cvslog] r25505 - in trunk/libavformat: asfdec.c asfenc.c avienc.c id3v2.c matroskadec.c metadata.c metadata.h mp3.c oggparsevorbis.c vorbiscomment.c
aurel
subversion
Sat Oct 16 15:20:41 CEST 2010
Author: aurel
Date: Sat Oct 16 15:20:41 2010
New Revision: 25505
Log:
add ff_ prefix to metadata_conv()
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Modified:
trunk/libavformat/asfdec.c
trunk/libavformat/asfenc.c
trunk/libavformat/avienc.c
trunk/libavformat/id3v2.c
trunk/libavformat/matroskadec.c
trunk/libavformat/metadata.c
trunk/libavformat/metadata.h
trunk/libavformat/mp3.c
trunk/libavformat/oggparsevorbis.c
trunk/libavformat/vorbiscomment.c
Modified: trunk/libavformat/asfdec.c
==============================================================================
--- trunk/libavformat/asfdec.c Sat Oct 16 15:07:20 2010 (r25504)
+++ trunk/libavformat/asfdec.c Sat Oct 16 15:20:41 2010 (r25505)
@@ -659,7 +659,7 @@ static int asf_read_header(AVFormatConte
}
}
- metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv);
+ ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv);
return 0;
}
Modified: trunk/libavformat/asfenc.c
==============================================================================
--- trunk/libavformat/asfenc.c Sat Oct 16 15:07:20 2010 (r25504)
+++ trunk/libavformat/asfenc.c Sat Oct 16 15:20:41 2010 (r25505)
@@ -279,7 +279,7 @@ static int asf_write_header1(AVFormatCon
int bit_rate;
int64_t duration;
- metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL);
+ ff_metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL);
tags[0] = av_metadata_get(s->metadata, "title" , NULL, 0);
tags[1] = av_metadata_get(s->metadata, "author" , NULL, 0);
Modified: trunk/libavformat/avienc.c
==============================================================================
--- trunk/libavformat/avienc.c Sat Oct 16 15:07:20 2010 (r25504)
+++ trunk/libavformat/avienc.c Sat Oct 16 15:20:41 2010 (r25505)
@@ -370,7 +370,7 @@ static int avi_write_header(AVFormatCont
list2 = ff_start_tag(pb, "LIST");
put_tag(pb, "INFO");
- metadata_conv(&s->metadata, ff_avi_metadata_conv, NULL);
+ ff_metadata_conv(&s->metadata, ff_avi_metadata_conv, NULL);
for (i = 0; *ff_avi_tags[i]; i++) {
if ((t = av_metadata_get(s->metadata, ff_avi_tags[i], NULL, AV_METADATA_MATCH_CASE)))
avi_write_info_tag(s->pb, t->key, t->value);
Modified: trunk/libavformat/id3v2.c
==============================================================================
--- trunk/libavformat/id3v2.c Sat Oct 16 15:07:20 2010 (r25504)
+++ trunk/libavformat/id3v2.c Sat Oct 16 15:20:41 2010 (r25505)
@@ -250,7 +250,7 @@ void ff_id3v2_parse(AVFormatContext *s,
/* Skip to end of tag */
url_fseek(s->pb, next, SEEK_SET);
}
- metadata_conv(&s->metadata, NULL, ff_id3v2_metadata_conv);
+ ff_metadata_conv(&s->metadata, NULL, ff_id3v2_metadata_conv);
if (len > 0) {
/* Skip padding */
Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c Sat Oct 16 15:07:20 2010 (r25504)
+++ trunk/libavformat/matroskadec.c Sat Oct 16 15:20:41 2010 (r25505)
@@ -1048,7 +1048,7 @@ static void matroska_convert_tag(AVForma
matroska_convert_tag(s, &tags[i].sub, metadata, key);
}
}
- metadata_conv(metadata, NULL, ff_mkv_metadata_conv);
+ ff_metadata_conv(metadata, NULL, ff_mkv_metadata_conv);
}
static void matroska_convert_tags(AVFormatContext *s)
Modified: trunk/libavformat/metadata.c
==============================================================================
--- trunk/libavformat/metadata.c Sat Oct 16 15:07:20 2010 (r25504)
+++ trunk/libavformat/metadata.c Sat Oct 16 15:20:41 2010 (r25505)
@@ -113,8 +113,8 @@ void av_metadata_free(AVMetadata **pm)
av_freep(pm);
}
-void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
- const AVMetadataConv *s_conv)
+void ff_metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
+ const AVMetadataConv *s_conv)
{
/* TODO: use binary search to look up the two conversion tables
if the tables are getting big enough that it would matter speed wise */
@@ -150,11 +150,11 @@ void ff_metadata_conv_ctx(AVFormatContex
const AVMetadataConv *s_conv)
{
int i;
- metadata_conv(&ctx->metadata, d_conv, s_conv);
+ ff_metadata_conv(&ctx->metadata, d_conv, s_conv);
for (i=0; i<ctx->nb_streams ; i++)
- metadata_conv(&ctx->streams [i]->metadata, d_conv, s_conv);
+ ff_metadata_conv(&ctx->streams [i]->metadata, d_conv, s_conv);
for (i=0; i<ctx->nb_chapters; i++)
- metadata_conv(&ctx->chapters[i]->metadata, d_conv, s_conv);
+ ff_metadata_conv(&ctx->chapters[i]->metadata, d_conv, s_conv);
for (i=0; i<ctx->nb_programs; i++)
- metadata_conv(&ctx->programs[i]->metadata, d_conv, s_conv);
+ ff_metadata_conv(&ctx->programs[i]->metadata, d_conv, s_conv);
}
Modified: trunk/libavformat/metadata.h
==============================================================================
--- trunk/libavformat/metadata.h Sat Oct 16 15:07:20 2010 (r25504)
+++ trunk/libavformat/metadata.h Sat Oct 16 15:20:41 2010 (r25505)
@@ -48,8 +48,8 @@ void ff_metadata_demux_compat(AVFormatCo
void ff_metadata_mux_compat(AVFormatContext *s);
#endif
-void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
- const AVMetadataConv *s_conv);
+void ff_metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
+ const AVMetadataConv *s_conv);
void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
const AVMetadataConv *s_conv);
Modified: trunk/libavformat/mp3.c
==============================================================================
--- trunk/libavformat/mp3.c Sat Oct 16 15:07:20 2010 (r25504)
+++ trunk/libavformat/mp3.c Sat Oct 16 15:20:41 2010 (r25505)
@@ -315,7 +315,7 @@ static int mp3_write_header(struct AVFor
size_pos = url_ftell(s->pb);
put_be32(s->pb, 0);
- metadata_conv(&s->metadata, ff_id3v2_metadata_conv, NULL);
+ ff_metadata_conv(&s->metadata, ff_id3v2_metadata_conv, NULL);
while ((t = av_metadata_get(s->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) {
uint32_t tag = 0;
Modified: trunk/libavformat/oggparsevorbis.c
==============================================================================
--- trunk/libavformat/oggparsevorbis.c Sat Oct 16 15:07:20 2010 (r25504)
+++ trunk/libavformat/oggparsevorbis.c Sat Oct 16 15:20:41 2010 (r25505)
@@ -138,7 +138,7 @@ ff_vorbis_comment(AVFormatContext * as,
av_log(as, AV_LOG_INFO,
"truncated comment header, %i comments not found\n", n);
- metadata_conv(m, NULL, ff_vorbiscomment_metadata_conv);
+ ff_metadata_conv(m, NULL, ff_vorbiscomment_metadata_conv);
return 0;
}
Modified: trunk/libavformat/vorbiscomment.c
==============================================================================
--- trunk/libavformat/vorbiscomment.c Sat Oct 16 15:07:20 2010 (r25504)
+++ trunk/libavformat/vorbiscomment.c Sat Oct 16 15:20:41 2010 (r25505)
@@ -55,7 +55,7 @@ int ff_vorbiscomment_length(AVMetadata *
int ff_vorbiscomment_write(uint8_t **p, AVMetadata **m,
const char *vendor_string, const unsigned count)
{
- metadata_conv(m, ff_vorbiscomment_metadata_conv, NULL);
+ ff_metadata_conv(m, ff_vorbiscomment_metadata_conv, NULL);
bytestream_put_le32(p, strlen(vendor_string));
bytestream_put_buffer(p, vendor_string, strlen(vendor_string));
if (*m) {
More information about the ffmpeg-cvslog
mailing list