[FFmpeg-cvslog] Merge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Aug  7 09:27:55 2015 +0200| [3d2d6728288fd6c00f119774ab2c86a6423813a5] | committer: Hendrik Leppkes

Merge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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