From e3a3b764c8a98fbdca2e0e3677fdcf233169d666 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 6 Jul 2014 19:02:49 +0200
Subject: dvd: fix first subtitle with delayed subtitle streams

This was accidentally broken with moving the DVD code to demux_disc.c.

Also remove an abort() call meant for debugging.
---
 demux/demux_disc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'demux/demux_disc.c')

diff --git a/demux/demux_disc.c b/demux/demux_disc.c
index 823d5727c4..b8835da3c4 100644
--- a/demux/demux_disc.c
+++ b/demux/demux_disc.c
@@ -179,7 +179,6 @@ static int d_fill_buffer(demuxer_t *demuxer)
 
     add_streams(demuxer);
     if (pkt->stream >= p->num_streams) { // out of memory?
-        abort();
         talloc_free(pkt);
         return 0;
     }
@@ -225,6 +224,9 @@ static int d_open(demuxer_t *demuxer, enum demux_check check)
     if (!p->slave)
         return -1;
 
+    // So that we don't miss initial packets of delayed subtitle streams.
+    p->slave->stream_select_default = true;
+
     // Incorrect, but fixes some behavior
     demuxer->ts_resets_possible = false;
     // Doesn't work, because stream_pts is a "guess".
-- 
cgit v1.2.3