summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-12-27 16:27:58 +0100
committerwm4 <wm4@nowhere>2012-12-28 14:21:25 +0100
commit56382c91e4a5a569af94cfab35a0c525c55ed2e3 (patch)
tree09fbca5eded25edaacfd6cccd85d4c40a847930c
parent527b39cafa9f84077aec68dc17558b8fce5c2106 (diff)
downloadmpv-56382c91e4a5a569af94cfab35a0c525c55ed2e3.tar.bz2
mpv-56382c91e4a5a569af94cfab35a0c525c55ed2e3.tar.xz
core: fix crash if VO init fails
-rw-r--r--core/mplayer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index 39991727c3..553da904bb 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -1740,7 +1740,7 @@ static bool is_non_interleaved(struct MPContext *mpctx, struct track *track)
struct demuxer *demuxer = track->demuxer;
for (int type = 0; type < STREAM_TYPE_COUNT; type++) {
struct track *other = mpctx->current_track[type];
- if (other != track && other->demuxer && other->demuxer == demuxer)
+ if (other && other != track && other->demuxer && other->demuxer == demuxer)
return false;
}
return true;