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-04 22:05:47 +0400
committerPeter Schlaile <peter@schlaile.de>2006-06-04 22:05:47 +0400
commitdf782b1122087b60a7eb9c40f5df7e48a6615f6f (patch)
treef380ad920cab1cc23cf52c723385e09349ac2342 /source/blender/src/hddaudio.c
parent42c5725349f3fccdc1bddb1976d93abe9ec1b48b (diff)
==Sequencer & ffmpeg==
Bugfixes: - hddaudio now allocates it's decode buffer + AVCODEC_MAX_AUDIO_FRAME_SIZE safety interval. (The former code expected all decoded audio frames to be the same size which can hurt under some circumstances e.g. VBR files) - writeffmpeg: some pointers where not initialized on start and after deletion not set to null. Could segfault randomly on error conditions. - drawseq: use startdisp and enddisp to decide, if a strip should be drawn. (Just extend strips first or last frame beyond screen dimensions in the previous version and watch the strip disappear)
Diffstat (limited to 'source/blender/src/hddaudio.c')
-rw-r--r--source/blender/src/hddaudio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/src/hddaudio.c b/source/blender/src/hddaudio.c
index 76297b29983..6ce7359d2be 100644
--- a/source/blender/src/hddaudio.c
+++ b/source/blender/src/hddaudio.c
@@ -170,7 +170,8 @@ struct hdaudio * sound_open_hdaudio(char * filename)
* 2;
rval->decode_cache = (short*) MEM_mallocN(
- rval->decode_cache_size * sizeof(short),
+ rval->decode_cache_size * sizeof(short)
+ + AVCODEC_MAX_AUDIO_FRAME_SIZE,
"hdaudio decode cache");
rval->decode_pos = 0;
rval->target_channels = -1;