From 7caecc53b0b8ac1805fa498fb9dbe9379f3053d4 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 10 Feb 2016 00:07:01 +0100
Subject: [PATCH] player: fix crash if no video decoder can be initialized

Caused by the recent refactoring for complex filters.
---
 player/video.c           | 1 +
 video/decode/dec_video.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/player/video.c b/player/video.c
index 9768a53b85..12a566cd12 100644
--- a/player/video.c
+++ b/player/video.c
@@ -395,6 +395,7 @@ int reinit_video_chain_src(struct MPContext *mpctx, struct lavfi_pad *src)
     mpctx->vo_chain = vo_c;
     vo_c->log = mpctx->log;
     vo_c->vo = mpctx->video_out;
+    vo_c->vf = vf_new(mpctx->global);
 
     vo_control(vo_c->vo, VOCTRL_GET_HWDEC_INFO, &vo_c->hwdec_info);
 
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index ed0bfb825e..d20d10304e 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -81,6 +81,8 @@ int video_vd_control(struct dec_video *d_video, int cmd, void *arg)
 
 void video_uninit(struct dec_video *d_video)
 {
+    if (!d_video)
+        return;
     mp_image_unrefp(&d_video->current_mpi);
     mp_image_unrefp(&d_video->cover_art_mpi);
     if (d_video->vd_driver) {