Merge commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb'
authorJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 19:40:05 +0000 (16:40 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 19:40:05 +0000 (16:40 -0300)
commitce9e07e6b67517cfa7603f97702c1645335c0634
treeea9ebbbe6227a5d1e0ea1bf84ff0265becb6410b
parentaf0505ed951505485f54c65decde2232385314f0
parentd32d59bc977b43031007bb2ab21e232f96d2ebcb
Merge commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb'

* commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb':
  matroska: Read only the data written in the scratch buffer

This commit is a noop, see fd59207c1c86c6a76059b3565d340da9f8f47530

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