----------------- obs-studio/cmake/Modules/CopyMSVCBins.cmake -----------------
diff --git a/cmake/Modules/CopyMSVCBins.cmake b/cmake/Modules/CopyMSVCBins.cmake
index c781e65..0df4339 100644
--- a/cmake/Modules/CopyMSVCBins.cmake
+++ b/cmake/Modules/CopyMSVCBins.cmake
index c781e65..0df4339 100644
@@ -53,9 +53,9 @@ file(GLOB FFMPEG_BIN_FILES
 	"${FFMPEG_swscale_INCLUDE_DIR}/bin${_bin_suffix}/swscale-*.dll"
 	"${FFMPEG_swscale_INCLUDE_DIR}/../bin${_bin_suffix}/swscale-*.dll"
 
-	"${FFMPEG_swresample_INCLUDE_DIR}/../bin/swresample-*.dll"
-	"${FFMPEG_swresample_INCLUDE_DIR}/../bin${_bin_suffix}/swresample-*.dll"
-	"${FFMPEG_swresample_INCLUDE_DIR}/bin${_bin_suffix}/swresample-*.dll"
+	"${FFMPEG_avresample_INCLUDE_DIR}/../bin/avresample-*.dll"
+	"${FFMPEG_avresample_INCLUDE_DIR}/../bin${_bin_suffix}/avresample-*.dll"
+	"${FFMPEG_avresample_INCLUDE_DIR}/bin${_bin_suffix}/avresample-*.dll"
 
 	"${FFMPEG_avcodec_INCLUDE_DIR}/../bin/libopus*.dll"
 	"${FFMPEG_avcodec_INCLUDE_DIR}/../bin/opus*.dll"

------------------ obs-studio/cmake/Modules/FindFFmpeg.cmake ------------------
diff --git a/CCallback.cpp b/CCallback.cpp
index aca205e..7a35d6f 100644
--- a/cmake/Modules/FindFFmpeg.cmake
+++ b/cmake/Modules/FindFFmpeg.cmake
@@ -134,8 +134,8 @@ foreach(component ${FFmpeg_FIND_COMPONENTS})
 		find_ffmpeg_library("${component}" "avutil.h")
 	elseif(component STREQUAL "postproc")
 		find_ffmpeg_library("${component}" "postprocess.h")
-	elseif(component STREQUAL "swresample")
-		find_ffmpeg_library("${component}" "swresample.h")
+	elseif(component STREQUAL "avresample")
+		find_ffmpeg_library("${component}" "avresample.h")
 	elseif(component STREQUAL "swscale")
 		find_ffmpeg_library("${component}" "swscale.h")
 	else()

--------------------- obs-studio/deps/libff/CMakeLists.txt ---------------------
diff --git a/CCallback.cpp b/CCallback.cpp
index c1413c0..695874d 100644
--- a/deps/libff/CMakeLists.txt
+++ b/deps/libff/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 2.8.11)
 project (libff)
 
 find_package(FFmpeg REQUIRED
-	COMPONENTS avcodec avfilter avdevice avutil swscale avformat swresample)
+	COMPONENTS avcodec avfilter avdevice avutil swscale avformat avresample)
 
 include_directories(${FFMPEG_INCLUDE_DIRS})
 

----------------------- obs-studio/libobs/CMakeLists.txt -----------------------
diff --git a/CCallback.cpp b/CCallback.cpp
index 698c33a..c371c16 100644
--- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt
@@ -3,7 +3,7 @@ project(libobs)
 find_package(Threads REQUIRED)
 
 find_package(FFmpeg REQUIRED
-	COMPONENTS avformat avutil swscale swresample
+	COMPONENTS avformat avutil swscale avresample
 	OPTIONAL_COMPONENTS avcodec)
 include_directories(${FFMPEG_INCLUDE_DIRS})
 

------------- obs-studio/libobs/media-io/audio-resampler-ffmpeg.c -------------
diff --git a/CCallback.cpp b/CCallback.cpp
index cd27a88..35c4a76 100644
--- a/libobs/media-io/audio-resampler-ffmpeg.c
+++ b/libobs/media-io/audio-resampler-ffmpeg.c
@@ -20,7 +20,7 @@
 #include "audio-io.h"
 #include <libavutil/avutil.h>
 #include <libavformat/avformat.h>
-#include <libswresample/swresample.h>
+#include <libavresample/avresample.h>
 
 struct audio_resampler {
 	struct SwrContext   *context;

----------------- obs-studio/plugins/obs-ffmpeg/CMakeLists.txt -----------------
diff --git a/CCallback.cpp b/CCallback.cpp
index 511431d..786cfe5 100644
--- a/plugins/obs-ffmpeg/CMakeLists.txt
+++ b/plugins/obs-ffmpeg/CMakeLists.txt
@@ -6,7 +6,7 @@ if(MSVC)
 endif()
 
 find_package(FFmpeg REQUIRED
-	COMPONENTS avcodec avfilter avdevice avutil swscale avformat swresample)
+	COMPONENTS avcodec avfilter avdevice avutil swscale avformat avresample)
 include_directories(${FFMPEG_INCLUDE_DIRS})
 
 set(obs-ffmpeg_HEADERS

diff --git a/deps/libff/libff/ff-circular-queue.c b/deps/libff/libff/ff-circular-queue.c
index 234edc4..c050196 100644
--- a/deps/libff/libff/ff-circular-queue.c
+++ b/deps/libff/libff/ff-circular-queue.c
@@ -15,6 +15,7 @@
  */
 
 #include "ff-circular-queue.h"
+#include <string.h>
 
 static void *queue_fetch_or_alloc(struct ff_circular_queue *cq,
 		int index)