From 761b1587bab3870584833e4299156dfea6d70f63 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 25 May 2016 23:48:17 +0100 Subject: [PATCH] Fix missing return value in ::pass(). --- src/lib/video_mxf_decoder.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc index 37ffafa71..70c884699 100644 --- a/src/lib/video_mxf_decoder.cc +++ b/src/lib/video_mxf_decoder.cc @@ -35,8 +35,15 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr content, sha } bool -VideoMXFDecoder::pass (PassReason reason, bool) +VideoMXFDecoder::pass (PassReason, bool) { + double const vfr = _content->active_video_frame_rate (); + int64_t const frame = _next.frames_round (vfr); + + if (frame >= _content->video->length()) { + return true; + } + shared_ptr mono; try { mono.reset (new dcp::MonoPictureAsset (_content->path(0))); @@ -59,9 +66,6 @@ VideoMXFDecoder::pass (PassReason reason, bool) } } - double const vfr = _content->active_video_frame_rate (); - int64_t const frame = _next.frames_round (vfr); - if (mono) { video->give (shared_ptr (new J2KImageProxy (mono->get_frame(frame), mono->size())), frame); } else { @@ -70,6 +74,7 @@ VideoMXFDecoder::pass (PassReason reason, bool) } _next += ContentTime::from_frames (1, vfr); + return false; } void -- 2.30.2