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)
commit43b136ce80eabcc51e948cd62dec1b5d0e5e7914
tree4ba553bb859edae3c3a630330cf0224a550a4183
parentf31f610f337d6e7cdd5dc465b5795127e618c145
parent0982152c3fb05365597978c5d7cfeeb7ced01723
Merge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'

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

This commit is a noop.

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