diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 02:06:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 02:06:40 +0100 |
| commit | 3b709fd912749d7731fa954cfb3aedd18d8a666a (patch) | |
| tree | a03db8b7a73f30593cae44159cf17042aaf9ce15 /libavformat/mov.c | |
| parent | 50697ac5b2e7151b7e29299a5e36aef17695f9c4 (diff) | |
| parent | 9dcf2397219ca796f0fafce2a703770d6fd09920 (diff) | |
Merge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'
* commit '9dcf2397219ca796f0fafce2a703770d6fd09920':
lavf: Check the return value of strftime
Conflicts:
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index f81b1092f2..bb1858886c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -816,8 +816,8 @@ static void mov_metadata_creation_time(AVDictionary **metadata, int64_t time) timet = time; ptm = gmtime(&timet); if (!ptm) return; - strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", ptm); - av_dict_set(metadata, "creation_time", buffer, 0); + if (strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", ptm)) + av_dict_set(metadata, "creation_time", buffer, 0); } } |