[vlc-commits] display: only pass the vout_display_priv_t to vout_display_start()

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Sep  3 10:23:36 2020 +0200| [53e19a39313c8e793188a4ba9a48fe1443a45a13] | committer: Steve Lhomme

display: only pass the vout_display_priv_t to vout_display_start()

All the fields we use in this function comes from this structure.

Move the function after the vout_display_priv_t definition.

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

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

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 289147b262..6ac5581bee 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -290,9 +290,10 @@ typedef struct {
 static int vout_display_start(void *func, bool forced, va_list ap)
 {
     vout_display_open_cb activate = func;
-    vout_display_t *vd = va_arg(ap, vout_display_t *);
-    const vout_display_cfg_t *cfg = va_arg(ap, const vout_display_cfg_t *);
-    vlc_video_context *context = va_arg(ap, vlc_video_context *);
+    vout_display_priv_t *osys = va_arg(ap, vout_display_priv_t *);
+    const vout_display_cfg_t *cfg = &osys->cfg;
+    vout_display_t *vd = &osys->display;
+    vlc_video_context *context = osys->src_vctx;
 
     /* Picture buffer does not have the concept of aspect ratio */
     video_format_Copy(&vd->fmt, &vd->source);
@@ -747,8 +748,7 @@ vout_display_t *vout_display_New(vlc_object_t *parent,
         vd->owner = *owner;
 
     if (vlc_module_load(vd, "vout display", module, module && *module != '\0',
-                        vout_display_start, vd, &osys->cfg,
-                        osys->src_vctx) == NULL)
+                        vout_display_start, osys) == NULL)
         goto error;
 
 #if defined(__OS2__)