griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T97453: Blender crash when selecting Caching checkbox in VSE

Browse Source 
Merge Audaspace fixes from upstream.
This commit is contained in:
Jörg Müller
2022-04-22 22:36:04 +02:00
parent ff6098345a
commit ac8beb4fda
6 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp vendored
View File

@@ -361,7 +361,7 @@ int FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size)
{
FFMPEGReader* reader = reinterpret_cast<FFMPEGReader*>(opaque);
int size = std::min(buf_size, reader->m_membuffer->getSize() - reader->m_membufferpos);
long long size = std::min(static_cast<long long>(buf_size), reader->m_membuffer->getSize() - reader->m_membufferpos);
if(size < 0)
return -1;