Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavformat / mlvdec.c

diff --git a/ffmpeg/libavformat/mlvdec.c b/ffmpeg/libavformat/mlvdec.c
index 1855ea46ce18175cfa5d36c9e509ad6cb9e2eef8..17bdb17e72e6b48882e3a68f1bed0b7eee55732d 100644 (file)
--- a/ffmpeg/libavformat/mlvdec.c
+++ b/ffmpeg/libavformat/mlvdec.c
@@ -204,8 +204,8 @@ static int scan_file(AVFormatContext *avctx, AVStream *vst, AVStream *ast, int f
             time.tm_yday   = avio_rl16(pb);
             time.tm_isdst  = avio_rl16(pb);
             avio_skip(pb, 2);
-            strftime(str, sizeof(str), "%Y-%m-%d %H:%M:%S", &time);
-            av_dict_set(&avctx->metadata, "time", str, 0);
+            if (strftime(str, sizeof(str), "%Y-%m-%d %H:%M:%S", &time))
+                av_dict_set(&avctx->metadata, "time", str, 0);
             size -= 20;
         } else if (type == MKTAG('E','X','P','O') && size >= 16) {
             av_dict_set(&avctx->metadata, "isoMode", avio_rl32(pb) ? "auto" : "manual", 0);