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/drawseq.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/drawseq.c')
-rw-r--r--source/blender/src/drawseq.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c
index 353ef78cebc..44f002f28bd 100644
--- a/source/blender/src/drawseq.c
+++ b/source/blender/src/drawseq.c
@@ -1026,8 +1026,8 @@ void drawseqspace(ScrArea *sa, void *spacedata)
seq= ed->seqbasep->first;
while(seq) { /* bound box test, dont draw outside the view */
if (seq->flag & SELECT ||
- seq->start > v2d->cur.xmax ||
- seq->start+seq->len < v2d->cur.xmin ||
+ seq->startdisp > v2d->cur.xmax ||
+ seq->enddisp < v2d->cur.xmin ||
seq->machine+1.0 < v2d->cur.ymin ||
seq->machine > v2d->cur.ymax)
{
@@ -1043,8 +1043,8 @@ void drawseqspace(ScrArea *sa, void *spacedata)
seq= ed->seqbasep->first;
while(seq) { /* bound box test, dont draw outside the view */
if (!(seq->flag & SELECT) ||
- seq->start > v2d->cur.xmax ||
- seq->start+seq->len < v2d->cur.xmin ||
+ seq->startdisp > v2d->cur.xmax ||
+ seq->enddisp < v2d->cur.xmin ||
seq->machine+1.0 < v2d->cur.ymin ||
seq->machine > v2d->cur.ymax)
{