From aac304410bf92d009c83633fb11cf0a251c6f881 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 2 May 2015 05:52:34 +0200
Subject: [PATCH] (Video) Call gfx_ctx_free from common function -
 uninit_video_input

---
 gfx/d3d/d3d.cpp    | 4 ----
 gfx/drivers/gl.c   | 2 --
 gfx/drivers/vg.c   | 2 --
 gfx/video_driver.c | 4 ++++
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 26d1943840..427f495bb5 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -851,10 +851,6 @@ static void d3d_free(void *data)
    d3d_free_overlays(d3d);
 #endif
 
-#ifdef _XBOX
-   gfx_ctx_free(d3d);
-#else
-
 #ifdef HAVE_MENU
    d3d_free_overlay(d3d, d3d->menu);
 #endif
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 17f24ca023..cd62234c60 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -1806,8 +1806,6 @@ static void gl_free(void *data)
    }
 #endif
 
-   gfx_ctx_free(gl);
-
    free(gl->empty_buf);
    free(gl->conv_buffer);
    free(gl);
diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index 505ba2bc68..1bd80ea479 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -202,8 +202,6 @@ static void vg_free(void *data)
       vgDestroyPaint(vg->mPaintBg);
    }
 
-   gfx_ctx_free(vg);
-
    free(vg);
 }
 
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 74a263b9bd..80e8ac30f1 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <string/string_list.h>
 #include "video_driver.h"
+#include "video_context_driver.h"
 #include "video_thread_wrapper.h"
 #include "video_pixel_converter.h"
 #include "video_monitor.h"
@@ -414,6 +415,9 @@ void uninit_video_input(void)
       )
       input_driver_free();
 
+   if (driver->video_context && driver->video_data)
+      gfx_ctx_free(driver->video_data);
+
    if (
          !driver->video_data_own &&
          driver->video_data &&