Commit 383b25fd authored by Eli Friedman's avatar Eli Friedman Committed by Aurelien Jacobs

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

Originally committed as revision 23936 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5935f9d6
...@@ -108,10 +108,11 @@ void ff_metadata_demux_compat(AVFormatContext *ctx) ...@@ -108,10 +108,11 @@ void ff_metadata_demux_compat(AVFormatContext *ctx)
#define FILL_METADATA(s, key, value) { \ #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); \ 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) { \ #define FILL_METADATA_INT(s, key) { \
char number[10]; \ char number[10]; \
snprintf(number, sizeof(number), "%d", s->key); \ snprintf(number, sizeof(number), "%d", s->key); \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment