diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 6b5d28db8c..8eb9d4f2a0 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -1803,7 +1803,7 @@ static bool video_pixel_frame_scale(const void *data,
 }
 
 /**
- * video_frame:
+ * video_driver_frame:
  * @data                 : pointer to data of the video frame.
  * @width                : width of the video frame.
  * @height               : height of the video frame.
@@ -1811,7 +1811,7 @@ static bool video_pixel_frame_scale(const void *data,
  *
  * Video frame render callback function.
  **/
-void video_frame(const void *data, unsigned width,
+void video_driver_frame(const void *data, unsigned width,
       unsigned height, size_t pitch)
 {
    unsigned output_width  = 0;
@@ -1842,7 +1842,7 @@ void video_frame(const void *data, unsigned width,
              !video_driver_state.filter.filter
           || !settings->video.post_filter_record 
           || !data
-          || global->record.gpu_buffer
+          || global && global->record.gpu_buffer
          )
       )
       recording_dump_frame(data, width, height, pitch);
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 71f882fc0e..d52a7e936b 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -448,10 +448,6 @@ void video_driver_cached_frame_get(const void **data, unsigned *width,
 void video_driver_menu_settings(void **list_data, void *list_info_data,
       void *group_data, void *subgroup_data, const char *parent_group);
 
-void video_driver_frame(const void *data,
-      unsigned width, unsigned height,
-      size_t pitch, const char *msg);
-
 /**
  * video_viewport_get_scaled_integer:
  * @vp            : Viewport handle
@@ -518,7 +514,7 @@ unsigned video_pixel_get_alignment(unsigned pitch);
 const video_poke_interface_t *video_driver_get_poke(void);
 
 /**
- * video_frame:
+ * video_driver_frame:
  * @data                 : pointer to data of the video frame.
  * @width                : width of the video frame.
  * @height               : height of the video frame.
@@ -526,7 +522,7 @@ const video_poke_interface_t *video_driver_get_poke(void);
  *
  * Video frame render callback function.
  **/
-void video_frame(const void *data, unsigned width,
+void video_driver_frame(const void *data, unsigned width,
       unsigned height, size_t pitch);
 
 uintptr_t video_driver_display_get(void);
diff --git a/libretro_version_1.c b/libretro_version_1.c
index dc08d02915..6f62cb5604 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -47,7 +47,7 @@ void retro_set_default_callbacks(void *data)
    if (!cbs)
       return;
 
-   cbs->frame_cb        = video_frame;
+   cbs->frame_cb        = video_driver_frame;
    cbs->sample_cb       = audio_driver_sample;
    cbs->sample_batch_cb = audio_driver_sample_batch;
    cbs->state_cb        = input_state;
@@ -73,7 +73,7 @@ void retro_init_libretro_cbs(void *data)
    (void)driver;
    (void)global;
 
-   core.retro_set_video_refresh(video_frame);
+   core.retro_set_video_refresh(video_driver_frame);
    core.retro_set_audio_sample(audio_driver_sample);
    core.retro_set_audio_sample_batch(audio_driver_sample_batch);
    core.retro_set_input_state(input_state);