From ad7768f4c47f4012cd306ee0098afd98fdff4461 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 16 Oct 2010 13:20:41 +0000 Subject: add ff_ prefix to metadata_conv() patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/metadata.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libavformat/metadata.c') diff --git a/libavformat/metadata.c b/libavformat/metadata.c index b4d9c5ef08..1164fbb495 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; inb_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; inb_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; inb_programs; i++) - metadata_conv(&ctx->programs[i]->metadata, d_conv, s_conv); + ff_metadata_conv(&ctx->programs[i]->metadata, d_conv, s_conv); } -- cgit v1.2.3