[Bf-blender-cvs] [3cd36f8] master: Fix T46815: Changing playback setting makes blender crash
Jörg Müller
noreply at git.blender.org
Wed Dec 2 10:56:27 CET 2015
Commit: 3cd36f85b0948f1e33e1aaef9f300fd9a0323026
Author: Jörg Müller
Date: Wed Dec 2 08:57:48 2015 +0100
Branches: master
https://developer.blender.org/rB3cd36f85b0948f1e33e1aaef9f300fd9a0323026
Fix T46815: Changing playback setting makes blender crash
Copied the fix from upstream audaspace.
===================================================================
M intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
index ba961f0..ff2c526 100644
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
@@ -389,9 +389,7 @@ void AUD_FFMPEGReader::seek(int position)
int length = AUD_DEFAULT_BUFFER_SIZE;
AUD_Buffer buffer(length * AUD_SAMPLE_SIZE(m_specs));
bool eos;
- for(int len = position - m_position;
- length == AUD_DEFAULT_BUFFER_SIZE;
- len -= AUD_DEFAULT_BUFFER_SIZE)
+ for(int len = position - m_position; len > 0; len -= AUD_DEFAULT_BUFFER_SIZE)
{
if(len < AUD_DEFAULT_BUFFER_SIZE)
length = len;
More information about the Bf-blender-cvs
mailing list