diff options
author | Anton Khirnov <wyskas@gmail.com> | 2010-10-16 17:20:41 +0400 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-16 17:20:41 +0400 |
commit | ad7768f4c47f4012cd306ee0098afd98fdff4461 (patch) | |
tree | 4872ef0fa45db203cf186cc346060291fa30fa60 | |
parent | d60a9f52eb42dc76dea9996c8ba3567ae98a9a04 (diff) |
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
-rw-r--r-- | libavformat/asfdec.c | 2 | ||||
-rw-r--r-- | libavformat/asfenc.c | 2 | ||||
-rw-r--r-- | libavformat/avienc.c | 2 | ||||
-rw-r--r-- | libavformat/id3v2.c | 2 | ||||
-rw-r--r-- | libavformat/matroskadec.c | 2 | ||||
-rw-r--r-- | libavformat/metadata.c | 12 | ||||
-rw-r--r-- | libavformat/metadata.h | 4 | ||||
-rw-r--r-- | libavformat/mp3.c | 2 | ||||
-rw-r--r-- | libavformat/oggparsevorbis.c | 2 | ||||
-rw-r--r-- | libavformat/vorbiscomment.c | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 519c15a090..b4be9d466f 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 863709b2ca..b964953b2b 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 744e0a63c0..c9476d5b9f 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 fbcb8f86ba..cc3697a713 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 b8a6711778..136839ad89 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 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); } diff --git a/libavformat/metadata.h b/libavformat/metadata.h index 197ca515e6..9e866503b5 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 77b131d5d5..ceba2ce506 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 ab6c6c74d8..cdb0266eee 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 c84144e4c4..d141b9dede 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) { |