summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-05-25 23:48:17 +0100
committerCarl Hetherington <cth@carlh.net>2016-05-25 23:48:17 +0100
commit761b1587bab3870584833e4299156dfea6d70f63 (patch)
tree9cb31c8ad154d49ce3f135bb384dea7a11c90ad7 /src/lib
parentcab3c244470c4b2ff3966a82debb57f4b9a25787 (diff)
Fix missing return value in ::pass().
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/video_mxf_decoder.cc13
1 files 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<const VideoMXFContent> 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<dcp::MonoPictureAsset> 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<ImageProxy> (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