From b4b1e2630c95d5e6014463f7608d59dc2322a3b8 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Mon, 26 Aug 2013 14:56:44 +0100 Subject: adding ffmpeg --- rotord/src/rotor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rotord/src') diff --git a/rotord/src/rotor.cpp b/rotord/src/rotor.cpp index 8b52301..bbae972 100755 --- a/rotord/src/rotor.cpp +++ b/rotord/src/rotor.cpp @@ -347,10 +347,10 @@ Image* Video_loader::output(const Frame_spec &frame){ int wanted; if (attributes["mode"]->intVal==VIDEOFRAMES_frame) { - wanted=(((int) ((frame.time*frame.framerate)+0.5))%(player.getNumberOfFrames()))+1; //+1 is necessary because 1st frame in a video is number 1? + wanted=(((int) ((frame.time*frame.framerate)+0.5))%max(1,player.getNumberOfFrames()-1))+1; //+1 is necessary because 1st frame in a video is number 1? } if (attributes["mode"]->intVal==VIDEOFRAMES_blend) { - wanted=(((int) ((frame.time*frame.framerate*clipspeed)+0.5))%(player.getNumberOfFrames()))+1; //+1 is necessary because 1st frame in a video is number 1? + wanted=(((int) ((frame.time*frame.framerate*clipspeed)+0.5))%max(1,player.getNumberOfFrames()-1))+1; //+1 is necessary because 1st frame in a video is number 1? } if (wanted!=lastframe){ -- cgit v1.2.3