diff options
author | James Almer <jamrial@gmail.com> | 2017-10-26 16:40:05 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-26 16:40:05 -0300 |
commit | ce9e07e6b67517cfa7603f97702c1645335c0634 (patch) | |
tree | ea9ebbbe6227a5d1e0ea1bf84ff0265becb6410b /libavcodec/indeo5data.h | |
parent | af0505ed951505485f54c65decde2232385314f0 (diff) | |
parent | d32d59bc977b43031007bb2ab21e232f96d2ebcb (diff) | |
download | ffmpeg-ce9e07e6b67517cfa7603f97702c1645335c0634.tar.gz |
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>
Diffstat (limited to 'libavcodec/indeo5data.h')
0 files changed, 0 insertions, 0 deletions