[FFmpeg-cvslog] avformat/movenc: Check return code of ff_iso8601_to_unix_time()

Michael Niedermayer git at videolan.org
Sun Jun 21 05:08:32 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 21 04:18:08 2015 +0200| [f98c3ec5c68d14d7c93c2f9775be4583f7905554] | committer: Michael Niedermayer

avformat/movenc: Check return code of ff_iso8601_to_unix_time()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f98c3ec5c68d14d7c93c2f9775be4583f7905554
---

 libavformat/movenc.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index adde4b2..d4bfed3 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -5247,8 +5247,13 @@ static int mov_write_header(AVFormatContext *s)
         mov_write_mdat_tag(pb, mov);
     }
 
-    if (t = av_dict_get(s->metadata, "creation_time", NULL, 0))
+    if (t = av_dict_get(s->metadata, "creation_time", NULL, 0)) {
         mov->time = ff_iso8601_to_unix_time(t->value);
+        if (mov->time < 0) {
+            av_log(s, AV_LOG_WARNING, "Failed to parse creation_time %s\n", t->value);
+            mov->time = 0;
+        }
+    }
     if (mov->time)
         mov->time += 0x7C25B080; // 1970 based -> 1904 based
 



More information about the ffmpeg-cvslog mailing list