Update ffmpeg find modules for recent changes to debian

cmake/Modules/FindLibavcodec.cmake

@@ -28,23 +28,25 @@ else()
 	find_path(FFMPEG_INCLUDE_DIR
 		NAMES libavcodec/avcodec.h
 		HINTS
+			"${_AVCODEC_INCLUDE_DIRS}"
 			"${CMAKE_SOURCE_DIR}/additional_install_files/include"
 			"$ENV{obsAdditionalInstallFiles}/include"
 			ENV FFmpegPath
 			ENV ${FFMPEG_PATH_ARCH}
-			"${_AVCODEC_INCLUDE_DIRS}"
+		PATHS
 			/usr/include /usr/local/include /opt/local/include /sw/include
 		PATH_SUFFIXES ffmpeg libav)
 
 	find_library(AVCODEC_LIB
-		NAMES avcodec
+		NAMES ${_AVCODEC_LIBRARIES} avcodec-ffmpeg avcodec
 		HINTS
+			"${_AVCODEC_LIBRARY_DIRS}"
 			"${FFMPEG_INCLUDE_DIR}/../lib"
 			"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
 			"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
 			"${FFMPEG_INCLUDE_DIR}/lib"
 			"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
-			"${_AVCODEC_LIBRARY_DIRS}"
+		PATHS
 			/usr/lib /usr/local/lib /opt/local/lib /sw/lib)
 
 	set(LIBAVCODEC_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavcodec include dir")

cmake/Modules/FindLibavformat.cmake

@@ -24,23 +24,25 @@ else()
 	find_path(FFMPEG_INCLUDE_DIR
 		NAMES libavformat/avformat.h
 		HINTS
+			"${_AVFORMAT_INCLUDE_DIRS}"
 			"${CMAKE_SOURCE_DIR}/additional_install_files/include"
 			"$ENV{obsAdditionalInstallFiles}/include"
 			ENV FFmpegPath
 			ENV ${FFMPEG_PATH_ARCH}
-			"${_AVFORMAT_INCLUDE_DIRS}"
+		PATHS
 			/usr/include /usr/local/include /opt/local/include /sw/include
 		PATH_SUFFIXES ffmpeg libav)
 
 	find_library(AVFORMAT_LIB
-		NAMES avformat
+		NAMES ${_AVFORMAT_LIBRARIES} avformat-ffmpeg avformat
 		HINTS
+			"${_AVFORMAT_LIBRARY_DIRS}"
 			"${FFMPEG_INCLUDE_DIR}/../lib"
 			"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
 			"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
 			"${FFMPEG_INCLUDE_DIR}/lib"
 			"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
-			"${_AVFORMAT_LIBRARY_DIRS}"
+		PATHS
 			/usr/lib /usr/local/lib /opt/local/lib /sw/lib)
 
 	set(LIBAVFORMAT_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavformat include dir")

cmake/Modules/FindLibavutil.cmake

@@ -24,23 +24,25 @@ else()
 	find_path(FFMPEG_INCLUDE_DIR
 		NAMES libavutil/avutil.h
 		HINTS
+			"${_AVUTIL_INCLUDE_DIRS}"
 			"${CMAKE_SOURCE_DIR}/additional_install_files/include"
 			"$ENV{obsAdditionalInstallFiles}/include"
 			ENV FFmpegPath
 			ENV ${FFMPEG_PATH_ARCH}
-			"${_AVUTIL_INCLUDE_DIRS}"
+		PATHS
 			/usr/include /usr/local/include /opt/local/include /sw/include
 		PATH_SUFFIXES ffmpeg libav)
 
 	find_library(AVUTIL_LIB
-		NAMES avutil
+		NAMES ${_AVUTIL_LIBRARIES} avutil-ffmpeg avutil
 		HINTS
+			"${_AVUTIL_LIBRARY_DIRS}"
 			"${FFMPEG_INCLUDE_DIR}/../lib"
 			"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
 			"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
 			"${FFMPEG_INCLUDE_DIR}/lib"
 			"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
-			"${_AVUTIL_LIBRARY_DIRS}"
+		PATHS
 			/usr/lib /usr/local/lib /opt/local/lib /sw/lib)
 
 	set(LIBAVUTIL_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavutil include dir")

cmake/Modules/FindLibswresample.cmake

@@ -24,23 +24,25 @@ else()
 	find_path(FFMPEG_INCLUDE_DIR
 		NAMES libswresample/swresample.h
 		HINTS
+			"${_SWRESAMPLE_INCLUDE_DIRS}"
 			"${CMAKE_SOURCE_DIR}/additional_install_files/include"
 			"$ENV{obsAdditionalInstallFiles}/include"
 			ENV FFmpegPath
 			ENV ${FFMPEG_PATH_ARCH}
-			"${_SWRESAMPLE_INCLUDE_DIRS}"
+		PATHS
 			/usr/include /usr/local/include /opt/local/include /sw/include
 		PATH_SUFFIXES ffmpeg libav)
 
 	find_library(SWRESAMPLE_LIB
-		NAMES swresample
+		NAMES ${_SWRESAMPLE_LIBRARIES} swresample-ffmpeg swresample
 		HINTS
+			"${_SWRESAMPLE_LIBRARY_DIRS}"
 			"${FFMPEG_INCLUDE_DIR}/../lib"
 			"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
 			"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
 			"${FFMPEG_INCLUDE_DIR}/lib"
 			"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
-			"${_SWRESAMPLE_LIBRARY_DIRS}"
+		PATHS
 			/usr/lib /usr/local/lib /opt/local/lib /sw/lib)
 
 	set(LIBSWRESAMPLE_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libswresample include dir")

cmake/Modules/FindLibswscale.cmake

@@ -24,23 +24,25 @@ else()
 	find_path(FFMPEG_INCLUDE_DIR
 		NAMES libswscale/swscale.h
 		HINTS
+			"${_SWSCALE_INCLUDE_DIRS}"
 			"${CMAKE_SOURCE_DIR}/additional_install_files/include"
 			"$ENV{obsAdditionalInstallFiles}/include"
 			ENV FFmpegPath
 			ENV ${FFMPEG_PATH_ARCH}
-			"${_SWSCALE_INCLUDE_DIRS}"
+		PATHS
 			/usr/include /usr/local/include /opt/local/include /sw/include
 		PATH_SUFFIXES ffmpeg libav)
 
 	find_library(SWSCALE_LIB
-		NAMES swscale
+		NAMES ${_SWSCALE_LIBRARIES} swscale-ffmpeg swscale
 		HINTS
+			"${_SWSCALE_LIBRARY_DIRS}"
 			"${FFMPEG_INCLUDE_DIR}/../lib"
 			"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
 			"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
 			"${FFMPEG_INCLUDE_DIR}/lib"
 			"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
-			"${_SWSCALE_LIBRARY_DIRS}"
+		PATHS
 			/usr/lib /usr/local/lib /opt/local/lib /sw/lib)
 
 	set(LIBSWSCALE_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libswscale include dir")