Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2006-06-25 00:48:57 +0400
committerPeter Schlaile <peter@schlaile.de>2006-06-25 00:48:57 +0400
commit893df4389222c5c0fd388010a7ae3ca646f836cb (patch)
tree244a38882fe37115f61ad6a0dcb3252ac66a3d6e /source/blender/src/seqaudio.c
parent2fc243bf6c85745355dcecd7e0221c6dd0071ef2 (diff)
== Sequencer ==
Bugfixes: - Previous seqaudio-patch broke mixdown functionality (no need to init SDL on mixdown case... || -> && ) - hddaudio-crash at end of track finally fixed.
Diffstat (limited to 'source/blender/src/seqaudio.c')
-rw-r--r--source/blender/src/seqaudio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/seqaudio.c b/source/blender/src/seqaudio.c
index e7a7710cdd6..c30c0d97123 100644
--- a/source/blender/src/seqaudio.c
+++ b/source/blender/src/seqaudio.c
@@ -512,7 +512,7 @@ void audiostream_play(Uint32 startframe, Uint32 duration, int mixdown)
sound_init_audio();
}
- if (!audio_initialised || !(duration + mixdown)) {
+ if (!audio_initialised && !(duration + mixdown)) {
desired.freq=G.scene->audio.mixrate;
desired.format=AUDIO_S16SYS;
desired.channels=2;