RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2015-10-31 12:52:02 +01:00
parent 7984d25ceb
commit b92fd602ce
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
video/out/vo_direct3d.c
View File

@ -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)

3
video/out/w32_common.c
View File

@ -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)

2
video/out/w32_common.h
View File

@ -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);