summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-01 16:18:48 +0100
committerwm4 <wm4@nowhere>2014-01-01 20:57:12 +0100
commit3c8fc4588d26601da04489fe3d377861e6e34673 (patch)
tree98d4fc682ee70e85a82634914d6cae70d018a8ae
parent416015f059c52efec14cb4ba7e151d383c743d76 (diff)
downloadmpv-3c8fc4588d26601da04489fe3d377861e6e34673.tar.bz2
mpv-3c8fc4588d26601da04489fe3d377861e6e34673.tar.xz
player: fix DVD playback
Crashed in case of lazily added subtitle streams, which add tracks with track->stream set to NULL. Fixes gituhub issue #439.
-rw-r--r--player/loadfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 402b30c5be..14faeb08c9 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -281,7 +281,7 @@ void reselect_demux_streams(struct MPContext *mpctx)
// Note: we assume that all demuxer streams are covered by the track list.
for (int t = 0; t < mpctx->num_tracks; t++) {
struct track *track = mpctx->tracks[t];
- if (track->demuxer)
+ if (track->demuxer && track->stream)
demuxer_select_track(track->demuxer, track->stream, track->selected);
}
}