diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c
index 3d2227c779..7a5383d292 100644
--- a/record/drivers/record_ffmpeg.c
+++ b/record/drivers/record_ffmpeg.c
@@ -65,7 +65,6 @@ extern "C" {
 }
 #endif
 
-#include "../../configuration.h"
 #include "../../retroarch.h"
 #include "../../verbosity.h"
 
@@ -1042,7 +1041,6 @@ static void ffmpeg_free(void *data)
 
 static void *ffmpeg_new(const struct record_params *params)
 {
-   settings_t *settings = config_get_ptr();
    ffmpeg_t *handle     = (ffmpeg_t*)calloc(1, sizeof(*handle));
    if (!handle)
       return NULL;
@@ -1065,11 +1063,11 @@ static void *ffmpeg_new(const struct record_params *params)
          ffmpeg_init_config_common(
                &handle->config,
                params->preset,
-               settings->bools.video_gpu_record,
-               settings->uints.video_record_scale_factor,
-               settings->uints.video_stream_scale_factor,
-               settings->uints.streaming_mode,
-               settings->uints.video_record_threads
+               params->video_gpu_record,
+               params->video_record_scale_factor,
+               params->video_stream_scale_factor,
+               params->streaming_mode,
+               params->video_record_threads
                );
          break;
    }
@@ -1082,7 +1080,7 @@ static void *ffmpeg_new(const struct record_params *params)
 
    if (handle->config.audio_enable && 
          !ffmpeg_init_audio(handle,
-            settings->arrays.audio_resampler))
+            params->audio_resampler))
       goto error;
 
    if (!ffmpeg_init_muxer_post(handle))
diff --git a/retroarch.c b/retroarch.c
index 243af30cb5..3c8ff69521 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -11988,6 +11988,13 @@ static bool recording_init(void)
       }
    }
 
+   params.audio_resampler           = settings->arrays.audio_resampler;
+   params.video_gpu_record          = settings->bools.video_gpu_record;
+   params.video_record_scale_factor = settings->uints.video_record_scale_factor;
+   params.video_stream_scale_factor = settings->uints.video_stream_scale_factor;
+   params.video_record_threads      = settings->uints.video_record_threads;
+   params.streaming_mode            = settings->uints.streaming_mode;
+
    params.out_width  = av_info->geometry.base_width;
    params.out_height = av_info->geometry.base_height;
    params.fb_width   = av_info->geometry.max_width;
diff --git a/retroarch.h b/retroarch.h
index 52f182b3e5..c193a6f363 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -660,6 +660,14 @@ struct record_params
 
    /* Path to config. Optional. */
    const char *config;
+
+   bool video_gpu_record;
+   unsigned video_record_scale_factor;
+   unsigned video_stream_scale_factor;
+   unsigned video_record_threads;
+   unsigned streaming_mode;
+
+   const char *audio_resampler;
 };
 
 struct record_video_data