movenc: Don't store a nonzero creation time if nothing was set by the caller
authorMartin Storsjö <martin@martin.st>
Mon, 9 Jan 2012 16:35:01 +0000 (18:35 +0200)
committerMartin Storsjö <martin@martin.st>
Tue, 10 Jan 2012 14:02:07 +0000 (16:02 +0200)
If the creation time is stored in the file as a zero, the
mov demuxer skips exporting the creation time. Currently,
files muxed without a creation time get demuxed with a
Jan 1st 1970 creation timestamp.

Signed-off-by: Martin Storsjö <martin@martin.st>
libavformat/movenc.c

index e11eb50..85b5667 100644 (file)
@@ -2317,7 +2317,8 @@ static int mov_write_header(AVFormatContext *s)
 #endif
     if (t = av_dict_get(s->metadata, "creation_time", NULL, 0))
         mov->time = ff_iso8601_to_unix_time(t->value);
-    mov->time += 0x7C25B080; //1970 based -> 1904 based
+    if (mov->time)
+        mov->time += 0x7C25B080; // 1970 based -> 1904 based
 
     if (mov->chapter_track)
         mov_create_chapter_track(s, mov->chapter_track);