[vlc-commits] direct3d11: fix the output video_format_t initialization

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Thu Jul 27 17:46:13 2017 +0200| [b22442ede108c6d39995eab85d631055aa256f41] | committer: Jean-Baptiste Kempf

direct3d11: fix the output video_format_t initialization

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b22442ede108c6d39995eab85d631055aa256f41
---

 modules/video_output/win32/direct3d11.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 150bbfd0b1..62da3dd839 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -532,13 +532,14 @@ static int Open(vlc_object_t *object)
 #endif
 
     video_format_t fmt;
+    video_format_Copy(&fmt, &vd->source);
     if (Direct3D11Open(vd, &fmt)) {
         msg_Err(vd, "Direct3D11 could not be opened");
         goto error;
     }
 
     video_format_Clean(&vd->fmt);
-    video_format_Copy(&vd->fmt, &fmt);
+    vd->fmt = fmt;
 
     vd->info.has_double_click     = true;
     vd->info.has_hide_mouse       = false;
@@ -1484,8 +1485,6 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt)
     vout_display_sys_t *sys = vd->sys;
     IDXGIFactory2 *dxgifactory;
 
-    *fmt = vd->source;
-
 #if !VLC_WINSTORE_APP
 
     UINT creationFlags = 0;