From 73b9b0b830b49d243a9b959fc5a8dc0351968f0c Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 15 Jun 2013 18:57:38 +0200 Subject: w32_common: remove some unneeded code vo_w32_init() can be called only once on a VO. --- video/out/w32_common.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 41b8855c20..e97a9e2e85 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -570,12 +570,10 @@ int vo_w32_config(struct vo *vo, uint32_t width, uint32_t height, */ int vo_w32_init(struct vo *vo) { - struct vo_w32_state *w32 = vo->w32; - if (w32 && w32->window) - return 1; + assert(!vo->w32); - if (!w32) - w32 = vo->w32 = talloc_zero(vo, struct vo_w32_state); + struct vo_w32_state *w32 = talloc_zero(vo, struct vo_w32_state); + vo->w32 = w32; HINSTANCE hInstance = GetModuleHandleW(NULL); -- cgit v1.2.3