[FFmpeg-cvslog] Merge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu May  4 21:38:00 2017 -0300| [43b136ce80eabcc51e948cd62dec1b5d0e5e7914] | committer: James Almer

Merge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'

* commit '0982152c3fb05365597978c5d7cfeeb7ced01723':
  matroskadec: fix SRT subtitle duration

This commit is a noop.

Merged-by: James Almer <jamrial at gmail.com>

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