Another pot/merge.

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

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 95dd668ee4246709ed72c08479613cd02536b9d2..216721375fac0f832bf06c17dc5c117f890e50d1 100644 (file)
--- a/src/lib/video_mxf_decoder.cc
+++ b/src/lib/video_mxf_decoder.cc
@@ -66,14 +66,14 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, sha
        }
 }
 
-void
+bool
 VideoMXFDecoder::pass ()
 {
        double const vfr = _content->active_video_frame_rate ();
        int64_t const frame = _next.frames_round (vfr);
 
        if (frame >= _content->video->length()) {
-               return;
+               return true;
        }
 
        if (_mono_reader) {
@@ -90,10 +90,12 @@ VideoMXFDecoder::pass ()
        }
 
        _next += ContentTime::from_frames (1, vfr);
+       return false;
 }
 
 void
-VideoMXFDecoder::seek (ContentTime t, bool)
+VideoMXFDecoder::seek (ContentTime t, bool accurate)
 {
+       Decoder::seek (t, accurate);
        _next = t;
 }