[vlc-commits] display: eliminate an intermediate variable

Rémi Denis-Courmont git at videolan.org
Sun Dec 9 20:45:43 CET 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec  8 19:19:18 2018 +0200| [0a90a9255d061ccfd343ddaf958c1c8346c9d9b7] | committer: Rémi Denis-Courmont

display: eliminate an intermediate variable

No functional changes.

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

 src/video_output/display.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 9349366b92..4979e1997f 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -940,11 +940,11 @@ static vout_display_t *DisplayNew(vout_thread_t *vout,
 {
     /* */
     vout_display_owner_sys_t *osys = calloc(1, sizeof(*osys));
-    vout_display_cfg_t *cfg = &osys->cfg;
 
-    *cfg = state->cfg;
-    vout_display_GetDefaultDisplaySize(&cfg->display.width, &cfg->display.height,
-                                       source, cfg);
+    osys->cfg = state->cfg;
+    vout_display_GetDefaultDisplaySize(&osys->cfg.display.width,
+                                       &osys->cfg.display.height,
+                                       source, &osys->cfg);
 
     osys->vout = vout;
     osys->is_splitter = is_splitter;
@@ -955,7 +955,7 @@ static vout_display_t *DisplayNew(vout_thread_t *vout,
     vlc_mouse_Init(&osys->mouse.state);
 
 #if defined(_WIN32) || defined(__OS2__)
-    osys->is_fullscreen  = cfg->is_fullscreen;
+    osys->is_fullscreen  = osys->cfg.is_fullscreen;
     osys->wm_state = state->wm_state;
     osys->ch_wm_state = true;
 #endif
@@ -979,7 +979,7 @@ static vout_display_t *DisplayNew(vout_thread_t *vout,
 
     vout_display_t *p_display = vout_display_New(VLC_OBJECT(vout),
                                                  module, !is_splitter,
-                                                 source, cfg, &owner);
+                                                 source, &osys->cfg, &owner);
     if (!p_display)
         goto error;
 



More information about the vlc-commits mailing list