diff options
| author | Martin Storsjö <martin@martin.st> | 2012-01-09 18:35:01 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-01-10 16:02:07 +0200 |
| commit | a78dbada55d6b467dd560e0780f6bc50f72ba21a (patch) | |
| tree | 40b501513331236f9df3949b70fbbf6d15a5a31f | |
| parent | 353a2d2164c09740e42f33014c4773b93e96a0d2 (diff) | |
| download | ffmpeg-a78dbada55d6b467dd560e0780f6bc50f72ba21a.tar.gz | |
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@martin.st>
| -rw-r--r-- | libavformat/movenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index e11eb509d8..85b5667076 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); |