From 253623d9e8679d3539f1071d469f7994b0fe88a4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 19 Nov 2013 22:16:56 +0100 Subject: player: deselect video track if initialization fails This didn't have any consequences, other than suddenly reinitializing video when it works again (such as with EDL timeline mixing video and audio-only files). Conflicts: mpvcore/player/video.c --- mpvcore/mplayer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c index 23b86f6945..c81741066b 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/mplayer.c @@ -2481,6 +2481,7 @@ err_out: no_video: uninit_player(mpctx, INITIALIZED_VCODEC | (opts->force_vo ? 0 : INITIALIZED_VO)); cleanup_demux_stream(mpctx, STREAM_VIDEO); + mpctx->current_track[STREAM_VIDEO] = NULL; handle_force_window(mpctx, true); mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "Video: no video\n"); return 0; -- cgit v1.2.3