X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=0f2bc4358008e62123e8e042a8247c142e317c71;hb=0877bf6d06de8e6f768534ec40c26bf629618a20;hp=f912c473cd5d7e37513cb7fa4a93df133d2c93d6;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index f912c473c..0f2bc4358 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -44,17 +44,26 @@ Decoder::position () const
 	optional<ContentTime> pos;
 	shared_ptr<const Film> f = film();
 
-	if (video && !video->ignore() && (!pos || video->position(f) < *pos)) {
+	if (video && !video->ignore() && (!pos || video->position(f).get_value_or(ContentTime()) < *pos)) {
 		pos = video->position(f);
 	}
 
-	if (audio && !audio->ignore() && (!pos || audio->position(f) < *pos)) {
+	if (audio && !audio->ignore() && (!pos || audio->position(f).get_value_or(ContentTime()) < *pos)) {
 		pos = audio->position(f);
 	}
 
-	BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
-		if (!i->ignore() && (!pos || i->position(f) < *pos)) {
-			pos = i->position(f);
+	/* Only decide position based on subtitle sources if there is nothing else
+	   to go on.  Otherwise we can have problems with muxed sources which have
+	   (for example) video, audio and a subtitle.  If the subtitle data runs out
+	   before the video/audio the position() call will return the position of the
+	   end of the subs.  This causes this file to be pass()ed in favour of others,
+	   which can cause bugs like #1581.
+	*/
+	if (!pos) {
+		BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+			if (!i->ignore() && (!pos || i->position(f) < *pos)) {
+				pos = i->position(f);
+			}
 		}
 	}