Merge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Aug 2015 07:27:55 +0000 (09:27 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Aug 2015 07:27:55 +0000 (09:27 +0200)
commit3d2d6728288fd6c00f119774ab2c86a6423813a5
tree9df8ea8340638488542eb8a143ff6ae4b2702a64
parentb54cf4b8863d86e312ea19e5577913be4b773146
parente5997152f54f790229c99f237f8eb6b5b1ee683a
Merge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a'

* commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a':
  asf: Use time_t where needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/asfdec_o.c