diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-07 09:27:55 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-07 09:27:55 +0200 |
| commit | 3d2d6728288fd6c00f119774ab2c86a6423813a5 (patch) | |
| tree | 9df8ea8340638488542eb8a143ff6ae4b2702a64 /libavformat/asfdec_o.c | |
| parent | b54cf4b8863d86e312ea19e5577913be4b773146 (diff) | |
| parent | e5997152f54f790229c99f237f8eb6b5b1ee683a (diff) | |
Merge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a'
* commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a':
asf: Use time_t where needed
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/asfdec_o.c')
| -rw-r--r-- | libavformat/asfdec_o.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 6708329824..adc7f69bfb 100644 --- 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 |