From: James Almer <jamrial@gmail.com>
Date: Fri, 5 May 2017 00:38:00 +0000 (-0300)
Subject: Merge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'
X-Git-Tag: n3.5-dev~1783
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/43b136ce80eabcc51e948cd62dec1b5d0e5e7914

Merge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'

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

This commit is a noop.

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

43b136ce80eabcc51e948cd62dec1b5d0e5e7914