# HG changeset patch # User aurel # Date 1277996601 0 # Node ID 8515b7b4fe87e17fcf2c51c3347ef8e00bba22e7 # Parent 1327f100894083255b589b9332069311ae0877fe fix warning in ff_metadata_mux_compat() warning: the address of 'number' will always evaluate as 'true' patch by Eli Friedman eli _dot_ friedman _at_ gmail _dot_ com diff -r 1327f1008940 -r 8515b7b4fe87 metadata_compat.c --- a/metadata_compat.c Thu Jul 01 14:49:32 2010 +0000 +++ b/metadata_compat.c Thu Jul 01 15:03:21 2010 +0000 @@ -108,10 +108,11 @@ #define FILL_METADATA(s, key, value) { \ - if (value && *value && !av_metadata_get(s->metadata, #key, NULL, 0)) \ + if (!av_metadata_get(s->metadata, #key, NULL, 0)) \ av_metadata_set2(&s->metadata, #key, value, 0); \ } -#define FILL_METADATA_STR(s, key) FILL_METADATA(s, key, s->key) +#define FILL_METADATA_STR(s, key) { \ + if (s->key && *s->key) FILL_METADATA(s, key, s->key); } #define FILL_METADATA_INT(s, key) { \ char number[10]; \ snprintf(number, sizeof(number), "%d", s->key); \