]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af0505e d32d59b)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.