diff options
| author | Jörg Müller <nexyon@gmail.com> | 2015-12-02 10:57:48 +0300 |
|---|---|---|
| committer | Jörg Müller <nexyon@gmail.com> | 2015-12-02 12:23:07 +0300 |
| commit | 3cd36f85b0948f1e33e1aaef9f300fd9a0323026 (patch) | |
| tree | b2fad9e18808570ea66eb38c0c4696b16c0bc0cb /intern/audaspace | |
| parent | 400647422554091b73bc6fb35a793c1a2df10bef (diff) | |
Fix T46815: Changing playback setting makes blender crash
Copied the fix from upstream audaspace.
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp index ba961f0cb78..ff2c526bf49 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; |