diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-10-16 13:20:41 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-16 13:20:41 +0000 |
| commit | ad7768f4c47f4012cd306ee0098afd98fdff4461 (patch) | |
| tree | 4872ef0fa45db203cf186cc346060291fa30fa60 /libavformat/metadata.c | |
| parent | d60a9f52eb42dc76dea9996c8ba3567ae98a9a04 (diff) | |
| download | ffmpeg-ad7768f4c47f4012cd306ee0098afd98fdff4461.tar.gz | |
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
Diffstat (limited to 'libavformat/metadata.c')
| -rw-r--r-- | libavformat/metadata.c | 12 |
1 files changed, 6 insertions, 6 deletions
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; 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); } |