From b92fd602ced5f71e843ef87edf3de6cf68b05b12 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 31 Oct 2015 12:52:02 +0100
Subject: vo_direct3d: fix operation

Regression since commit 93db4233. I think the bit that was forgotten
here was to remove the vo_w32_config() return value completely. The VO
failed to init because that function always returned 0. This commit
removes these bits and fixes the VO.

Fixes #2434.
---
 video/out/vo_direct3d.c | 8 +-------
 video/out/w32_common.c  | 3 +--
 video/out/w32_common.h  | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'video')

diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index 4ee5e66d32..76c92ca339 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -1333,13 +1333,7 @@ static int reconfig(struct vo *vo, struct mp_image_params *params)
 
     priv->have_image = false;
 
-    /* w32_common framework call. Creates window on the screen with
-     * the given coordinates.
-     */
-    if (!vo_w32_config(vo)) {
-        MP_VERBOSE(priv, "Creating window failed.\n");
-        return VO_ERROR;
-    }
+    vo_w32_config(vo);
 
     if ((priv->image_format != params->imgfmt)
         || (priv->src_width != params->w)
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index c0396b2fa2..266dfbc69d 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -1088,11 +1088,10 @@ static void gui_thread_reconfig(void *ptr)
 }
 
 // Resize the window. On the first call, it's also made visible.
-int vo_w32_config(struct vo *vo)
+void vo_w32_config(struct vo *vo)
 {
     struct vo_w32_state *w32 = vo->w32;
     mp_dispatch_run(w32->dispatch, gui_thread_reconfig, w32);
-    return 0;
 }
 
 static void thread_disable_ime(void)
diff --git a/video/out/w32_common.h b/video/out/w32_common.h
index 094660a34f..88cc664bf2 100644
--- a/video/out/w32_common.h
+++ b/video/out/w32_common.h
@@ -29,7 +29,7 @@ struct vo;
 int vo_w32_init(struct vo *vo);
 void vo_w32_uninit(struct vo *vo);
 int vo_w32_control(struct vo *vo, int *events, int request, void *arg);
-int vo_w32_config(struct vo *vo);
+void vo_w32_config(struct vo *vo);
 HWND vo_w32_hwnd(struct vo *vo);
 void vo_w32_run_on_thread(struct vo *vo, void (*cb)(void *ctx), void *ctx);
 
-- 
cgit v1.2.3