Merge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'
authorJames Almer <jamrial@gmail.com>
Fri, 5 May 2017 00:38:00 +0000 (21:38 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 5 May 2017 00:38:00 +0000 (21:38 -0300)
* commit '0982152c3fb05365597978c5d7cfeeb7ced01723':
  matroskadec: fix SRT subtitle duration

This commit is a noop.

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

Trivial merge