summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-10-05 18:12:06 +0200
committerwm4 <wm4@nowhere>2013-10-05 22:46:14 +0200
commitc3ea08a2d7df3a782ce8e40a99caa807b6bc60b0 (patch)
tree3a3eca0da7639d5845f9b473e220cefc3a460de2
parent89fced63b8193de3e17150e166b53c947fffcb89 (diff)
downloadmpv-c3ea08a2d7df3a782ce8e40a99caa807b6bc60b0.tar.bz2
mpv-c3ea08a2d7df3a782ce8e40a99caa807b6bc60b0.tar.xz
mplayer: fix cleanup if VO initialization fails
Just specifying a VO that doesn't exist would make it crash. Regression caused by commit 6a0408b.
-rw-r--r--mpvcore/mplayer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c
index c621b93b10..7669a83851 100644
--- a/mpvcore/mplayer.c
+++ b/mpvcore/mplayer.c
@@ -2457,6 +2457,7 @@ int reinit_video_chain(struct MPContext *mpctx)
err_out:
no_video:
uninit_player(mpctx, INITIALIZED_VCODEC | (opts->force_vo ? 0 : INITIALIZED_VO));
+ cleanup_demux_stream(mpctx, STREAM_VIDEO);
handle_force_window(mpctx, true);
mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "Video: no video\n");
return 0;