Mercurial > libavformat.hg
changeset 4353:e4a1b568b313 libavformat
modify the way to pass parameters to av_metadata_set()
This improves code readability and this avoid warnings about discarding
qualifiers from pointer target type.
| author | aurel |
|---|---|
| date | Mon, 02 Feb 2009 21:45:55 +0000 |
| parents | 817bef131f7f |
| children | 6111dd03464b |
| files | avformat.h avidec.c metadata.c metadata_compat.c |
| diffstat | 4 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Mon Feb 02 21:32:11 2009 +0000 +++ b/avformat.h Mon Feb 02 21:45:55 2009 +0000 @@ -89,10 +89,11 @@ /** * sets the given tag in m, overwriting an existing tag. - * @param tag tag to add to m, key and value will be av_strduped. + * @param key tag key to add to m (will be av_strduped). + * @param value tag value to add to m (will be av_strduped). * @return >= 0 if success otherwise error code that is <0. */ -int av_metadata_set(AVMetadata **m, AVMetadataTag tag); +int av_metadata_set(AVMetadata **pm, const char *key, const char *value); /** * Free all the memory allocated for an AVMetadata struct.
--- a/avidec.c Mon Feb 02 21:32:11 2009 +0000 +++ b/avidec.c Mon Feb 02 21:45:55 2009 +0000 @@ -229,7 +229,7 @@ get_strz(pb, value, sizeof(value)); url_fseek(pb, i+size, SEEK_SET); - return av_metadata_set(&s->metadata, (const AVMetadataTag){key, value}); + return av_metadata_set(&s->metadata, key, value); } static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
--- a/metadata.c Mon Feb 02 21:32:11 2009 +0000 +++ b/metadata.c Mon Feb 02 21:45:55 2009 +0000 @@ -44,10 +44,10 @@ return NULL; } -int av_metadata_set(AVMetadata **pm, AVMetadataTag elem) +int av_metadata_set(AVMetadata **pm, const char *key, const char *value) { AVMetadata *m= *pm; - AVMetadataTag *tag= av_metadata_get(m, elem.key, NULL, AV_METADATA_MATCH_CASE); + AVMetadataTag *tag= av_metadata_get(m, key, NULL, AV_METADATA_MATCH_CASE); if(!m) m=*pm= av_mallocz(sizeof(*m)); @@ -63,10 +63,10 @@ }else return AVERROR(ENOMEM); } - if(elem.value){ - elem.key = av_strdup(elem.key ); - elem.value= av_strdup(elem.value); - m->elems[m->count++]= elem; + if(value){ + m->elems[m->count].key = av_strdup(key ); + m->elems[m->count].value= av_strdup(value); + m->count++; } if(!m->count) av_freep(pm);
--- a/metadata_compat.c Mon Feb 02 21:32:11 2009 +0000 +++ b/metadata_compat.c Mon Feb 02 21:45:55 2009 +0000 @@ -106,7 +106,7 @@ #define FILL_METADATA(s, key, value) { \ if (value && *value && !av_metadata_get(s->metadata, #key, NULL, 0)) \ - av_metadata_set(&s->metadata, (const AVMetadataTag){#key, value}); \ + av_metadata_set(&s->metadata, #key, value); \ } #define FILL_METADATA_STR(s, key) FILL_METADATA(s, key, s->key) #define FILL_METADATA_INT(s, key) { \