Merge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a'

* commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a': asf: Use time_t where needed Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
10 years ago · 3d2d672828
parent b54cf4b886 e5997152f5
commit 3d2d672828
1 changed files with 1 additions and 1 deletions
--- a/libavformat/asfdec_o.c
+++ b/libavformat/asfdec_o.c
@ -641,7 +641,7 @@ static int asf_read_properties(AVFormatContext *s, const GUIDParseTable *g)
 {
    ASFContext *asf = s->priv_data;
    AVIOContext *pb = s->pb;
-    uint64_t creation_time;
+    time_t creation_time;
    avio_rl64(pb); // read object size
    avio_skip(pb, 16); // skip File ID