From 4181d82ad1e3cbe9f3774e6c60767e1915201548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= Date: Tue, 2 Aug 2022 20:17:46 +0200 Subject: [PATCH] Fix T99812: Audio scrubbing freezes Blender 3.2.1 Bug was caused by a change in ffmpeg's API. --- extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp index ad33c267c74..5035ed05be5 100644 --- a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp +++ b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp @@ -363,8 +363,8 @@ int FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size) long long size = std::min(static_cast(buf_size), reader->m_membuffer->getSize() - reader->m_membufferpos); - if(size < 0) - return -1; + if(size <= 0) + return AVERROR_EOF; std::memcpy(buf, ((data_t*)reader->m_membuffer->getBuffer()) + reader->m_membufferpos, size); reader->m_membufferpos += size;