diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 519c15a0900e40366a01e053f6f1868f7dc08882..b4be9d466f674c7704798f33a6c3bb25e5dc05c1 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -659,7 +659,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
}
}
- metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv);
+ ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv);
return 0;
}
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index 863709b2ca302e91897ae53fb4d953dd59d34c86..b964953b2b49de4e3131cf19eb1752f1ab750cba 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -279,7 +279,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
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);
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 744e0a63c0dad9958db26f70fb80dc8ede8a94a9..c9476d5b9f2e1b487b901c9196350a3d06fd0c4b 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -370,7 +370,7 @@ static int avi_write_header(AVFormatContext *s)
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);
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index fbcb8f86badee6a3bc5f6d25cc3c83c6e28ed335..cc3697a71394587ee717ac0b0a5395ba8fef595c 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -250,7 +250,7 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
/* 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 */
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index b8a6711778f65cfc81c7634ac1d3f42d3fca9bdb..136839ad8947c6bc1e29d2433d65557ce82aee8d 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1048,7 +1048,7 @@ static void matroska_convert_tag(AVFormatContext *s, EbmlList *list,
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)
diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index b4d9c5ef081261de09282ea55ca66d4599896100..1164fbb4956779080556cd7fdd0f7e012d90a337 100644
--- a/libavformat/metadata.c
+++ b/libavformat/metadata.c
@@ -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(AVFormatContext *ctx, const AVMetadataConv *d_conv,
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);
}
diff --git a/libavformat/metadata.h b/libavformat/metadata.h
index 197ca515e6d8eb7c0af876f00d2beb6088db912c..9e866503b5f6257cec805212bd327c80a43db45e 100644
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -48,8 +48,8 @@ void ff_metadata_demux_compat(AVFormatContext *s);
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);
diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index 77b131d5d51810121fb161490699c02c9979f9d4..ceba2ce50640c3a225335a0a00a70ca1ae94a282 100644
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -315,7 +315,7 @@ static int mp3_write_header(struct AVFormatContext *s)
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;
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index ab6c6c74d8ddca12225a3f356b28fb896ee3847f..cdb0266eee82026a112c67b7b7a1426be8b39641 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -138,7 +138,7 @@ ff_vorbis_comment(AVFormatContext * as, AVMetadata **m, const uint8_t *buf, int
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;
}
diff --git a/libavformat/vorbiscomment.c b/libavformat/vorbiscomment.c
index c84144e4c45cdec35e4c4ab72bff418610269e52..d141b9dedeea341bc7a6998ad9acfdb5d62a3068 100644
--- a/libavformat/vorbiscomment.c
+++ b/libavformat/vorbiscomment.c
@@ -55,7 +55,7 @@ int ff_vorbiscomment_length(AVMetadata *m, const char *vendor_string,
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) {