[vlc-commits] direct3d11: no need for an interim vout_display_info_t value

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Thu Feb  2 14:54:17 2017 +0100| [5e421c3eeff6e2e48848763002cdb5e28d90ccd2] | committer: Jean-Baptiste Kempf

direct3d11: no need for an interim vout_display_info_t value

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

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

 modules/video_output/win32/direct3d11.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index eea5d59..6e72a0d 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -533,25 +533,23 @@ static int Open(vlc_object_t *object)
         goto error;
     }
 
-    vout_display_info_t info  = vd->info;
-    info.is_slow              = !is_d3d11_opaque(fmt.i_chroma);
-    info.has_double_click     = true;
-    info.has_hide_mouse       = false;
-    info.has_pictures_invalid = !is_d3d11_opaque(fmt.i_chroma);
+    video_format_Clean(&vd->fmt);
+    video_format_Copy(&vd->fmt, &fmt);
+
+    vd->info.is_slow              = !is_d3d11_opaque(fmt.i_chroma);
+    vd->info.has_double_click     = true;
+    vd->info.has_hide_mouse       = false;
+    vd->info.has_pictures_invalid = !is_d3d11_opaque(fmt.i_chroma);
 
     if (var_InheritBool(vd, "direct3d11-hw-blending") &&
         vd->sys->d3dregion_format != NULL)
     {
         vd->sys->pSubpictureChromas[0] = vd->sys->d3dregion_format->fourcc;
         vd->sys->pSubpictureChromas[1] = 0;
-        info.subpicture_chromas = vd->sys->pSubpictureChromas;
+        vd->info.subpicture_chromas = vd->sys->pSubpictureChromas;
     }
     else
-        info.subpicture_chromas = NULL;
-
-    video_format_Clean(&vd->fmt);
-    video_format_Copy(&vd->fmt, &fmt);
-    vd->info = info;
+        vd->info.subpicture_chromas = NULL;
 
     vd->pool    = Pool;
     vd->prepare = Prepare;