[FFmpeg-cvslog] Merge commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Oct 26 16:40:05 2017 -0300| [ce9e07e6b67517cfa7603f97702c1645335c0634] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce9e07e6b67517cfa7603f97702c1645335c0634
---