[FFmpeg-cvslog] movenc: Don' t store a nonzero creation time if nothing was set by the caller

Martin Storsjö git at videolan.org
Wed Jan 11 02:57:11 CET 2012


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Jan  9 18:35:01 2012 +0200| [a78dbada55d6b467dd560e0780f6bc50f72ba21a] | committer: Martin Storsjö

movenc: Don't store a nonzero creation time if nothing was set by the caller

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 at martin.st>

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

 libavformat/movenc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index e11eb50..85b5667 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -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);



More information about the ffmpeg-cvslog mailing list