diff --git a/gfx/common/drm_common.c b/gfx/common/drm_common.c
index e9ddf2e82e..b1d11ec999 100644
--- a/gfx/common/drm_common.c
+++ b/gfx/common/drm_common.c
@@ -64,11 +64,11 @@ bool drm_get_resources(int fd)
    return true;
 }
 
-bool drm_get_connector(int fd, video_frame_info_t video_info)
+bool drm_get_connector(int fd, video_frame_info_t *video_info)
 {
    unsigned i;
    unsigned monitor_index = 0;
-   unsigned monitor       = MAX(video_info.monitor_index, 1);
+   unsigned monitor       = MAX(video_info->monitor_index, 1);
 
    /* Enumerate all connectors. */
 
diff --git a/gfx/common/drm_common.h b/gfx/common/drm_common.h
index 5a855f92be..e66e1c1704 100644
--- a/gfx/common/drm_common.h
+++ b/gfx/common/drm_common.h
@@ -53,7 +53,7 @@ void drm_setup(int fd);
 
 void drm_free(void);
 
-bool drm_get_connector(int fd, video_frame_info_t video_info);
+bool drm_get_connector(int fd, video_frame_info_t *video_info);
 
 static INLINE bool drm_wait_flip(int timeout)
 {
diff --git a/gfx/drivers_context/android_ctx.c b/gfx/drivers_context/android_ctx.c
index cc0b0eddf8..2d50909dcd 100644
--- a/gfx/drivers_context/android_ctx.c
+++ b/gfx/drivers_context/android_ctx.c
@@ -100,7 +100,7 @@ static void android_gfx_ctx_destroy(void *data)
    free(data);
 }
 
-static void *android_gfx_ctx_init(video_frame_info_t video_info, void *video_driver)
+static void *android_gfx_ctx_init(video_frame_info_t *video_info, void *video_driver)
 {
 #ifdef HAVE_OPENGLES
    EGLint n, major, minor;
diff --git a/gfx/drivers_context/cgl_ctx.c b/gfx/drivers_context/cgl_ctx.c
index 72dc6c5fc3..571476f4b7 100644
--- a/gfx/drivers_context/cgl_ctx.c
+++ b/gfx/drivers_context/cgl_ctx.c
@@ -275,7 +275,7 @@ static CGSSurfaceID attach_gl_context_to_window(CGLContextObj glCtx,
     return sid;
 }
 
-static void *gfx_ctx_cgl_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_cgl_init(video_frame_info_t *video_info, void *video_driver)
 {
    CGError err;
    gfx_ctx_cgl_data_t *cgl = (gfx_ctx_cgl_data_t*)calloc(1, sizeof(gfx_ctx_cgl_data_t));
diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index fa3c650e25..99b32e4022 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -213,7 +213,7 @@ void cocoagl_gfx_ctx_update(void)
 #endif
 }
 
-static void *cocoagl_gfx_ctx_init(video_frame_info_t video_info, void *video_driver)
+static void *cocoagl_gfx_ctx_init(video_frame_info_t *video_info, void *video_driver)
 {
    (void)video_driver;
     
diff --git a/gfx/drivers_context/d3d_ctx.cpp b/gfx/drivers_context/d3d_ctx.cpp
index b8bf02febd..d5716269c7 100644
--- a/gfx/drivers_context/d3d_ctx.cpp
+++ b/gfx/drivers_context/d3d_ctx.cpp
@@ -165,7 +165,7 @@ static bool gfx_ctx_d3d_bind_api(void *data,
 #endif
 }
 
-static void *gfx_ctx_d3d_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_d3d_init(video_frame_info_t *video_info, void *video_driver)
 {
    win32_monitor_init();
 
diff --git a/gfx/drivers_context/drm_ctx.c b/gfx/drivers_context/drm_ctx.c
index 090d706234..3500443857 100644
--- a/gfx/drivers_context/drm_ctx.c
+++ b/gfx/drivers_context/drm_ctx.c
@@ -330,7 +330,7 @@ static void gfx_ctx_drm_destroy_resources(gfx_ctx_drm_data_t *drm)
    g_next_bo           = NULL;
 }
 
-static void *gfx_ctx_drm_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_drm_init(video_frame_info_t *video_info, void *video_driver)
 {
    int fd, i;
    unsigned monitor_index;
diff --git a/gfx/drivers_context/emscriptenegl_ctx.c b/gfx/drivers_context/emscriptenegl_ctx.c
index 9052715e89..7a459c7a4d 100644
--- a/gfx/drivers_context/emscriptenegl_ctx.c
+++ b/gfx/drivers_context/emscriptenegl_ctx.c
@@ -99,7 +99,7 @@ static void gfx_ctx_emscripten_destroy(void *data)
    free(data);
 }
 
-static void *gfx_ctx_emscripten_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_emscripten_init(video_frame_info_t *video_info, void *video_driver)
 {
 #ifdef HAVE_EGL
    unsigned width, height;
diff --git a/gfx/drivers_context/gdi_ctx.cpp b/gfx/drivers_context/gdi_ctx.cpp
index 8f751d33c6..cb67ceab01 100644
--- a/gfx/drivers_context/gdi_ctx.cpp
+++ b/gfx/drivers_context/gdi_ctx.cpp
@@ -124,7 +124,7 @@ static void gfx_ctx_gdi_get_video_size(void *data,
    }
 }
 
-static void *gfx_ctx_gdi_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_gdi_init(video_frame_info_t *video_info, void *video_driver)
 {
    WNDCLASSEX wndclass = {0};
 
diff --git a/gfx/drivers_context/gfx_null_ctx.c b/gfx/drivers_context/gfx_null_ctx.c
index 16ba9b7883..e4c1c7ea4d 100644
--- a/gfx/drivers_context/gfx_null_ctx.c
+++ b/gfx/drivers_context/gfx_null_ctx.c
@@ -108,7 +108,7 @@ static void gfx_ctx_null_bind_hw_render(void *data, bool enable)
    (void)enable;
 }
 
-static void *gfx_ctx_null_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_null_init(video_frame_info_t *video_info, void *video_driver)
 {
    (void)video_driver;
 
diff --git a/gfx/drivers_context/khr_display_ctx.c b/gfx/drivers_context/khr_display_ctx.c
index 8d77a8a30f..d767a01c09 100644
--- a/gfx/drivers_context/khr_display_ctx.c
+++ b/gfx/drivers_context/khr_display_ctx.c
@@ -52,7 +52,7 @@ static void gfx_ctx_khr_display_get_video_size(void *data,
    *height = khr->height;
 }
 
-static void *gfx_ctx_khr_display_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_khr_display_init(video_frame_info_t *video_info, void *video_driver)
 {
    khr_display_ctx_data_t *khr = (khr_display_ctx_data_t*)calloc(1, sizeof(*khr));
    if (!khr)
diff --git a/gfx/drivers_context/mali_fbdev_ctx.c b/gfx/drivers_context/mali_fbdev_ctx.c
index cb1561ee9d..bc2d7c3a0e 100644
--- a/gfx/drivers_context/mali_fbdev_ctx.c
+++ b/gfx/drivers_context/mali_fbdev_ctx.c
@@ -87,7 +87,7 @@ static void gfx_ctx_mali_fbdev_get_video_size(void *data,
    *height = mali->height;
 }
 
-static void *gfx_ctx_mali_fbdev_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_mali_fbdev_init(video_frame_info_t *video_info, void *video_driver)
 {
 #ifdef HAVE_EGL
    EGLint n;
diff --git a/gfx/drivers_context/opendingux_fbdev_ctx.c b/gfx/drivers_context/opendingux_fbdev_ctx.c
index 411221e5b4..5170be9065 100644
--- a/gfx/drivers_context/opendingux_fbdev_ctx.c
+++ b/gfx/drivers_context/opendingux_fbdev_ctx.c
@@ -55,7 +55,7 @@ static void gfx_ctx_opendingux_destroy(void *data)
    }
 }
 
-static void *gfx_ctx_opendingux_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_opendingux_init(video_frame_info_t *video_info, void *video_driver)
 {
 #ifdef HAVE_EGL
    EGLint n;
diff --git a/gfx/drivers_context/osmesa_ctx.c b/gfx/drivers_context/osmesa_ctx.c
index d9381a6d9f..2d064efd59 100644
--- a/gfx/drivers_context/osmesa_ctx.c
+++ b/gfx/drivers_context/osmesa_ctx.c
@@ -141,7 +141,7 @@ static void osmesa_fifo_write(gfx_ctx_osmesa_data_t *osmesa)
    }
 }
 
-static void *osmesa_ctx_init(video_frame_info_t video_info, void *video_driver)
+static void *osmesa_ctx_init(video_frame_info_t *video_info, void *video_driver)
 {
 #ifdef HAVE_OSMESA_CREATE_CONTEXT_ATTRIBS
    const int attribs[] = {
diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c
index d781046fb6..2cece19adb 100644
--- a/gfx/drivers_context/ps3_ctx.c
+++ b/gfx/drivers_context/ps3_ctx.c
@@ -197,7 +197,7 @@ static void gfx_ctx_ps3_get_video_size(void *data,
 #endif
 }
 
-static void *gfx_ctx_ps3_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_ps3_init(video_frame_info_t *video_info, void *video_driver)
 {
 #ifdef HAVE_PSGL
    PSGLdeviceParameters params;
diff --git a/gfx/drivers_context/qnx_ctx.c b/gfx/drivers_context/qnx_ctx.c
index 670853b8a8..ce49599a23 100644
--- a/gfx/drivers_context/qnx_ctx.c
+++ b/gfx/drivers_context/qnx_ctx.c
@@ -72,7 +72,7 @@ static void gfx_ctx_qnx_destroy(void *data)
    free(data);
 }
 
-static void *gfx_ctx_qnx_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_qnx_init(video_frame_info_t *video_info, void *video_driver)
 {
    EGLint n;
    EGLint major, minor;
diff --git a/gfx/drivers_context/sdl_gl_ctx.c b/gfx/drivers_context/sdl_gl_ctx.c
index c7c2dd5425..17711fe0d7 100644
--- a/gfx/drivers_context/sdl_gl_ctx.c
+++ b/gfx/drivers_context/sdl_gl_ctx.c
@@ -71,7 +71,7 @@ static void sdl_ctx_destroy_resources(gfx_ctx_sdl_data_t *sdl)
    SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
 
-static void *sdl_ctx_init(video_frame_info_t video_info, void *video_driver)
+static void *sdl_ctx_init(video_frame_info_t *video_info, void *video_driver)
 {
    gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)
       calloc(1, sizeof(gfx_ctx_sdl_data_t));
diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
index a7614353a6..5a05be5f96 100644
--- a/gfx/drivers_context/vc_egl_ctx.c
+++ b/gfx/drivers_context/vc_egl_ctx.c
@@ -136,7 +136,7 @@ static void gfx_ctx_vc_get_video_size(void *data,
 
 static void gfx_ctx_vc_destroy(void *data);
 
-static void *gfx_ctx_vc_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_vc_init(video_frame_info_t *video_info, void *video_driver)
 {
    VC_DISPMANX_ALPHA_T alpha;
    EGLint n, major, minor;
diff --git a/gfx/drivers_context/vivante_fbdev_ctx.c b/gfx/drivers_context/vivante_fbdev_ctx.c
index 422fc1feec..b271791571 100644
--- a/gfx/drivers_context/vivante_fbdev_ctx.c
+++ b/gfx/drivers_context/vivante_fbdev_ctx.c
@@ -58,7 +58,7 @@ static void gfx_ctx_vivante_destroy(void *data)
 
 }
 
-static void *gfx_ctx_vivante_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_vivante_init(video_frame_info_t *video_info, void *video_driver)
 {
 #ifdef HAVE_EGL
    EGLint n;
diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
index 5f3d495702..b16f463d69 100644
--- a/gfx/drivers_context/wayland_ctx.c
+++ b/gfx/drivers_context/wayland_ctx.c
@@ -773,7 +773,7 @@ static bool gfx_ctx_wl_get_metrics(void *data,
    EGL_DEPTH_SIZE,      0
 #endif
 
-static void *gfx_ctx_wl_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_wl_init(video_frame_info_t *video_info, void *video_driver)
 {
 #ifdef HAVE_OPENGL
    static const EGLint egl_attribs_gl[] = {
diff --git a/gfx/drivers_context/wgl_ctx.cpp b/gfx/drivers_context/wgl_ctx.cpp
index 8b96d4e543..3f02ce7462 100644
--- a/gfx/drivers_context/wgl_ctx.cpp
+++ b/gfx/drivers_context/wgl_ctx.cpp
@@ -427,7 +427,7 @@ static void gfx_ctx_wgl_get_video_size(void *data,
    }
 }
 
-static void *gfx_ctx_wgl_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_wgl_init(video_frame_info_t *video_info, void *video_driver)
 {
    WNDCLASSEX wndclass = {0};
 
diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c
index b9a1a94553..2092651680 100644
--- a/gfx/drivers_context/x_ctx.c
+++ b/gfx/drivers_context/x_ctx.c
@@ -401,7 +401,7 @@ static bool gfx_ctx_x_set_resize(void *data,
    return false;
 }
 
-static void *gfx_ctx_x_init(video_frame_info_t video_info, void *data)
+static void *gfx_ctx_x_init(video_frame_info_t *video_info, void *data)
 {
    int nelements           = 0;
    int major               = 0;
diff --git a/gfx/drivers_context/xegl_ctx.c b/gfx/drivers_context/xegl_ctx.c
index f8b4bda4a1..2d54b26de0 100644
--- a/gfx/drivers_context/xegl_ctx.c
+++ b/gfx/drivers_context/xegl_ctx.c
@@ -91,7 +91,7 @@ EGL_BLUE_SIZE,       1, \
 EGL_ALPHA_SIZE,      0, \
 EGL_DEPTH_SIZE,      0
 
-static void *gfx_ctx_xegl_init(video_frame_info_t video_info, void *video_driver)
+static void *gfx_ctx_xegl_init(video_frame_info_t *video_info, void *video_driver)
 {
 #ifdef HAVE_EGL
    static const EGLint egl_attribs_gl[] = {
diff --git a/gfx/video_context_driver.c b/gfx/video_context_driver.c
index 8fba6894a2..c0617944d8 100644
--- a/gfx/video_context_driver.c
+++ b/gfx/video_context_driver.c
@@ -191,7 +191,7 @@ static const gfx_ctx_driver_t *video_context_driver_init(
 
       video_driver_build_info(&video_info);
 
-      ctx_data = ctx->init(video_info, data);
+      ctx_data = ctx->init(&video_info, data);
 
       if (!ctx_data)
          return NULL;
diff --git a/gfx/video_context_driver.h b/gfx/video_context_driver.h
index 660a953e12..65dadf11f8 100644
--- a/gfx/video_context_driver.h
+++ b/gfx/video_context_driver.h
@@ -67,7 +67,7 @@ typedef struct gfx_ctx_driver
     * to hold a pointer to it as the context never outlives the video driver.
     *
     * The context driver is responsible for it's own data.*/
-   void* (*init)(video_frame_info_t video_info, void *video_driver);
+   void* (*init)(video_frame_info_t *video_info, void *video_driver);
    void (*destroy)(void *data);
 
    /* Which API to bind to. */