From a865cd9dc54a3aa75a06def7fbb40f72b4283568 Mon Sep 17 00:00:00 2001 From: Niels Elburg Date: Sun, 9 Dec 2007 00:02:49 +0000 Subject: [PATCH] fix crash on reverse playback git-svn-id: svn://code.dyne.org/veejay/trunk@1045 eb8d1916-c9e9-0310-b8de-cf0c9472ead5 --- veejay-1.1/veejay-server/veejay/liblavplayvj.c | 6 +++--- veejay-1.1/veejay-server/veejay/vj-perform.c | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/veejay-1.1/veejay-server/veejay/liblavplayvj.c b/veejay-1.1/veejay-server/veejay/liblavplayvj.c index a9e70eb2..ddb048b7 100644 --- a/veejay-1.1/veejay-server/veejay/liblavplayvj.c +++ b/veejay-1.1/veejay-server/veejay/liblavplayvj.c @@ -524,11 +524,11 @@ int veejay_set_frame(veejay_t * info, long framenum) video_playback_setup *settings = (video_playback_setup *) info->settings; - if(framenum < 0) - return -1; + if(framenum < settings->min_frame_num) + framenum = settings->min_frame_num; if( framenum > settings->max_frame_num ) - framenum = settings->max_frame_num; + framenum = settings->max_frame_num; if(info->uc->playback_mode==VJ_PLAYBACK_MODE_SAMPLE) { diff --git a/veejay-1.1/veejay-server/veejay/vj-perform.c b/veejay-1.1/veejay-server/veejay/vj-perform.c index 8b1df9b6..cd463d25 100644 --- a/veejay-1.1/veejay-server/veejay/vj-perform.c +++ b/veejay-1.1/veejay-server/veejay/vj-perform.c @@ -392,9 +392,7 @@ static int vj_perform_increase_sample_frame(veejay_t * info, long num) int num = end - ((int) ( (double)range*rand()/(RAND_MAX))); settings->current_frame_num = num; } -#ifdef STRICT_CHECKING - assert( settings->current_frame_num >= 0 ); -#endif + if (settings->current_frame_num < start || settings->current_frame_num >= end ) { switch (looptype) { case 2: