diff options
| author | wm4 <wm4@nowhere> | 2014-07-06 19:02:49 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-07-06 19:02:49 +0200 |
| commit | e3a3b764c8a98fbdca2e0e3677fdcf233169d666 (patch) | |
| tree | 0ce961b415e5c6282f4b3c7edf7e1b2e35dd2879 /demux/demux_disc.c | |
| parent | 1d55547adf37f94be3bec973b59067c474e9d439 (diff) | |
| download | mpv-e3a3b764c8a98fbdca2e0e3677fdcf233169d666.tar.bz2 mpv-e3a3b764c8a98fbdca2e0e3677fdcf233169d666.tar.xz | |
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.
Diffstat (limited to 'demux/demux_disc.c')
| -rw-r--r-- | demux/demux_disc.c | 4 |
1 files changed, 3 insertions, 1 deletions
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". |