Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 52e8c04e6984f26d389d74ec61189fa80f749a69..3cadcca47198c1c79c801585b425e04971146bca 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -29,6 +29,7 @@ using std::cout;
 using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
+using namespace dcpomatic;
 
 Decoder::Decoder (weak_ptr<const Film> film)
        : _film (film)
@@ -51,9 +52,18 @@ Decoder::position () const
                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);
+                       }
                }
        }