From 16cce08fa7293d1126768bbbc44098c97012102c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 22 Mar 2015 00:24:47 +0100
Subject: [PATCH] Rename threaded_video_resolve to threaded_video_get_ptr

---
 gfx/video_driver.c         | 2 +-
 gfx/video_thread_wrapper.c | 6 +++---
 gfx/video_thread_wrapper.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 21c22ea45e..6449a3a072 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -211,7 +211,7 @@ void *video_driver_get_ptr(const video_driver_t **drv)
 #ifdef HAVE_THREADS
    if (settings->video.threaded
          && !global->system.hw_render_callback.context_type)
-      return rarch_threaded_video_resolve(drv);
+      return rarch_threaded_video_get_ptr(drv);
 #endif
    if (drv)
       *drv = driver->video;
diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c
index a6a7815364..01f966c61a 100644
--- a/gfx/video_thread_wrapper.c
+++ b/gfx/video_thread_wrapper.c
@@ -1040,7 +1040,7 @@ bool rarch_threaded_video_init(const video_driver_t **out_driver,
 }
 
 /**
- * rarch_threaded_video_resolve:
+ * rarch_threaded_video_get_ptr:
  * @drv                       : Found driver.
  *
  * Gets the underlying video driver associated with the 
@@ -1051,9 +1051,9 @@ bool rarch_threaded_video_init(const video_driver_t **out_driver,
  * with the threaded wrapper (if successful). If not successful,
  * NULL.
  **/
-void *rarch_threaded_video_resolve(const video_driver_t **drv)
+void *rarch_threaded_video_get_ptr(const video_driver_t **drv)
 {
-   driver_t *driver = driver_get_ptr();
+   driver_t *driver          = driver_get_ptr();
    const thread_video_t *thr = (const thread_video_t*)driver->video_data;
 
    if (drv)
diff --git a/gfx/video_thread_wrapper.h b/gfx/video_thread_wrapper.h
index cf3d2fdbb3..1e5767446b 100644
--- a/gfx/video_thread_wrapper.h
+++ b/gfx/video_thread_wrapper.h
@@ -224,7 +224,7 @@ bool rarch_threaded_video_init(
       const video_driver_t *driver, const video_info_t *info);
 
 /**
- * rarch_threaded_video_resolve:
+ * rarch_threaded_video_get_ptr:
  * @drv                       : Found driver.
  *
  * Gets the underlying video driver associated with the 
@@ -235,7 +235,7 @@ bool rarch_threaded_video_init(
  * with the threaded wrapper (if successful). If not successful,
  * NULL.
  **/
-void *rarch_threaded_video_resolve(const video_driver_t **drv);
+void *rarch_threaded_video_get_ptr(const video_driver_t **drv);
 
 #endif