Merge commit '3ec6f855d0f21d90a0494fb798c4cf203fdb3db0'
authorClément Bœsch <u@pkh.me>
Mon, 27 Mar 2017 20:07:19 +0000 (22:07 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 27 Mar 2017 20:07:19 +0000 (22:07 +0200)
commit7970888b67eb1ce791309bfb1b9fb7599a9165a2
tree3bbd5b8d671c445b836cf477245cf32ea8997a48
parent349a26f50901732a0690d76487319c9d0df56ae0
parent3ec6f855d0f21d90a0494fb798c4cf203fdb3db0
Merge commit '3ec6f855d0f21d90a0494fb798c4cf203fdb3db0'

* commit '3ec6f855d0f21d90a0494fb798c4cf203fdb3db0':
  srt: Adjust signedness of sscanf format strings

This commit is a noop, a different fix is included in the big -Wformat
patch under review
(http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209239.html)

Merged-by: Clément Bœsch <u@pkh.me>