Merge branch 'master' into 1.0

[dcpomatic.git] / src / lib / ffmpeg_decoder.cc

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 82c7cafd1b8ec629b1473402ed089b06efad0f16..d5285b73abea9448a971670017b823a9dbd507e0 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -519,16 +519,24 @@ FFmpegDecoder::seek (double p)
        return do_seek (p, false, false);
 }
 
-void
+bool
 FFmpegDecoder::seek_back ()
 {
-       do_seek (last_content_time() - 2.5 / video_frame_rate(), true, true);
+       if (last_content_time() < 2.5) {
+               return true;
+       }
+       
+       return do_seek (last_content_time() - 2.5 / video_frame_rate(), true, true);
 }
 
-void
+bool
 FFmpegDecoder::seek_forward ()
 {
-       do_seek (last_content_time() - 0.5 / video_frame_rate(), true, true);
+       if (last_content_time() >= (video_length() - video_frame_rate())) {
+               return true;
+       }
+       
+       return do_seek (last_content_time() - 0.5 / video_frame_rate(), true, true);
 }
 
 bool