Mercurial > libavformat.hg
changeset 4250:2fc899894f5e libavformat
replace AV_METADATA_IGNORE_CASE flag by a new AV_METADATA_MATCH_CASE flag
with the opposed meaning
| author | aurel |
|---|---|
| date | Sun, 18 Jan 2009 22:53:28 +0000 |
| parents | ffedcd3d4bed |
| children | 77e0c7511d41 |
| files | avformat.h avienc.c metadata.c metadata_compat.c |
| diffstat | 4 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Sun Jan 18 17:26:24 2009 +0000 +++ b/avformat.h Sun Jan 18 22:53:28 2009 +0000 @@ -67,7 +67,7 @@ * A demuxer should set a default if it sets any translated tag. */ -#define AV_METADATA_IGNORE_CASE 1 +#define AV_METADATA_MATCH_CASE 1 #define AV_METADATA_IGNORE_SUFFIX 2 typedef struct {
--- a/avienc.c Sun Jan 18 17:26:24 2009 +0000 +++ b/avienc.c Sun Jan 18 22:53:28 2009 +0000 @@ -105,9 +105,9 @@ static void avi_write_info_tag2(AVFormatContext *s, const char *fourcc, const char *key1, const char *key2) { - AVMetadataTag *tag= av_metadata_get(s->metadata, key1, NULL, AV_METADATA_IGNORE_CASE); + AVMetadataTag *tag= av_metadata_get(s->metadata, key1, NULL, 0); if(!tag && key2) - tag= av_metadata_get(s->metadata, key2, NULL, AV_METADATA_IGNORE_CASE); + tag= av_metadata_get(s->metadata, key2, NULL, 0); if(tag) avi_write_info_tag(s->pb, fourcc, tag->value); }
--- a/metadata.c Sun Jan 18 17:26:24 2009 +0000 +++ b/metadata.c Sun Jan 18 22:53:28 2009 +0000 @@ -33,8 +33,8 @@ for(; i<m->count; i++){ const char *s= m->elems[i].key; - if(flags & AV_METADATA_IGNORE_CASE) for(j=0; toupper(s[j]) == toupper(key[j]) && key[j]; j++); - else for(j=0; s[j] == key[j] && key[j]; j++); + if(flags & AV_METADATA_MATCH_CASE) for(j=0; s[j] == key[j] && key[j]; j++); + else for(j=0; toupper(s[j]) == toupper(key[j]) && key[j]; j++); if(key[j]) continue; if(s[j] && !(flags & AV_METADATA_IGNORE_SUFFIX)) @@ -47,7 +47,7 @@ int av_metadata_set(AVMetadata **pm, AVMetadataTag elem) { AVMetadata *m= *pm; - AVMetadataTag *tag= av_metadata_get(m, elem.key, NULL, 0); + AVMetadataTag *tag= av_metadata_get(m, elem.key, NULL, AV_METADATA_MATCH_CASE); if(!m) m=*pm= av_mallocz(sizeof(*m));
--- a/metadata_compat.c Sun Jan 18 17:26:24 2009 +0000 +++ b/metadata_compat.c Sun Jan 18 22:53:28 2009 +0000 @@ -105,8 +105,7 @@ #define FILL_METADATA(s, key, value) { \ - if (value && *value && \ - !av_metadata_get(s->metadata, #key, NULL, AV_METADATA_IGNORE_CASE)) \ + if (value && *value && !av_metadata_get(s->metadata, #key, NULL, 0)) \ av_metadata_set(&s->metadata, (const AVMetadataTag){#key, value}); \ } #define FILL_METADATA_STR(s, key) FILL_METADATA(s, key, s->key)