diff options
| author | wm4 <wm4@nowhere> | 2013-11-19 22:16:56 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-01 19:27:29 +0100 |
| commit | 253623d9e8679d3539f1071d469f7994b0fe88a4 (patch) | |
| tree | 5a2299240b5e9b0da382691f03514d7f8a925306 | |
| parent | b9f40d650a248c4f08af468cb129a1285a955acb (diff) | |
| download | mpv-253623d9e8679d3539f1071d469f7994b0fe88a4.tar.bz2 mpv-253623d9e8679d3539f1071d469f7994b0fe88a4.tar.xz | |
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
| -rw-r--r-- | mpvcore/mplayer.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |