diff --git a/cmake/Modules/FindFFmpeg.cmake b/cmake/Modules/FindFFmpeg.cmake
index c4eb7ca3..4c81e95b 100644
--- a/cmake/Modules/FindFFmpeg.cmake
+++ b/cmake/Modules/FindFFmpeg.cmake
@@ -1,55 +1,93 @@
 # vim: ts=2 sw=2
-# - Try to find the required ffmpeg components(default: AVFORMAT, AVUTIL, AVCODEC)
-#
-# Once done this will define
-#  FFMPEG_FOUND         - System has the all required components.
-#  FFMPEG_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
-#  FFMPEG_LIBRARIES     - Link these to use the required ffmpeg components.
-#  FFMPEG_DEFINITIONS   - Compiler switches required for using the required ffmpeg components.
-#
-# For each of the components it will additionally set.
-#   - AVCODEC
-#   - AVDEVICE
-#   - AVFORMAT
-#   - AVFILTER
-#   - AVUTIL
-#   - POSTPROC
-#   - SWSCALE
-#   - SWRESAMPLE
-#   - AVRESAMPLE
-# the following variables will be defined
-#  <component>_FOUND        - System has <component>
-#  <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers
-#  <component>_LIBRARIES    - Link these to use <component>
-#  <component>_DEFINITIONS  - Compiler switches required for using <component>
-#  <component>_VERSION      - The components version
-#
-# Copyright (c) 2006, Matthias Kretz, <kretz@kde.org>
-# Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2011, Michael Jansen, <kde@michael-jansen.biz>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#[=======================================================================[.rst:
+FindFFmpeg
+----------
+Try to find the requested ffmpeg components(default: avformat, avutil, avcodec)
 
+IMPORTED targets
+^^^^^^^^^^^^^^^^
+
+This module defines :prop_tgt:`IMPORTED` targets ``FFmpeg:<component>`` for
+each found component (see below).
+
+Components
+^^^^^^^^^^
+
+The module recognizes the following components:
+
+::
+
+  avcodec     - target FFmpeg::avcodec
+  avdevice    - target FFmpeg::avdevice
+  avformat    - target FFmpeg::avformat
+  avfilter    - target FFmpeg::avfilter
+  avutil      - target FFmpeg::avutil
+  postproc    - target FFmpeg::postproc
+  swscale     - target FFmpeg::swscale
+  swresample  - target FFmpeg::swresample
+  avresample  - target FFmpeg::avresample
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+::
+
+  FFMPEG_FOUND         - System has the all required components.
+  FFMPEG_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
+  FFMPEG_LIBRARIES     - Link these to use the required ffmpeg components.
+  FFMPEG_DEFINITIONS   - Compiler switches required for using the required ffmpeg components.
+
+For each component, ``<component>_FOUND`` will be set if the component is available.
+ 
+For each ``<component>_FOUND``,  the following variables will be defined:
+
+::
+
+  <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers
+  <component>_LIBRARIES    - Link these to use <component>
+  <component>_DEFINITIONS  - Compiler switches required for using <component>
+  <component>_VERSION      - The components version
+
+Backwards compatibility
+^^^^^^^^^^^^^^^^^^^^^^^
+
+For compatibility with previous versions of this module, uppercase names
+for FFmpeg and for all components are also recognized, and all-uppercase
+versions of the cache variables are also created.
+
+Copyright (c) 2006, Matthias Kretz, <kretz@kde.org>
+Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org>
+Copyright (c) 2011, Michael Jansen, <kde@michael-jansen.biz>
+Copyright (c) 2019, FeRD (Frank Dana) <ferdnyc@gmail.com>
+
+Redistribution and use is allowed according to the terms of the BSD license.
+For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#]=======================================================================]
 include(FindPackageHandleStandardArgs)
 
 # The default components were taken from a survey over other FindFFMPEG.cmake files
 if (NOT FFmpeg_FIND_COMPONENTS)
-	set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL)
+  set(FFmpeg_FIND_COMPONENTS avcodec avformat avutil)
 endif ()
 
+set(FFmpeg_ALL_COMPONENTS avcodec avdevice avformat avfilter avutil postproc swscale swresample avresample)
+
 #
 ### Macro: set_component_found
 #
 # Marks the given component as found if both *_LIBRARIES AND *_INCLUDE_DIRS is present.
 #
 macro(set_component_found _component )
-	if (${_component}_LIBRARIES AND ${_component}_INCLUDE_DIRS)
-		# message(STATUS "  - ${_component} found.")
-		set(${_component}_FOUND TRUE)
-	else ()
-		# message(STATUS "  - ${_component} not found.")
-	endif ()
+  if (${_component}_LIBRARIES AND ${_component}_INCLUDE_DIRS)
+		# message(STATUS "FFmpeg - ${_component} found.")
+    set(${_component}_FOUND TRUE)
+  else ()
+		if (NOT FFmpeg_FIND_QUIETLY AND NOT FFMPEG_FIND_QUIETLY)
+			message(STATUS "FFmpeg - ${_component} not found.")
+		endif ()
+  endif ()
 endmacro()
 
 #
@@ -60,102 +98,143 @@ endmacro()
 #
 macro(find_component _component _pkgconfig _library _header)
 
-	if (NOT WIN32)
-		# use pkg-config to get the directories and then use these values
-		# in the FIND_PATH() and FIND_LIBRARY() calls
-		find_package(PkgConfig)
-		if (PKG_CONFIG_FOUND)
-			pkg_check_modules(PC_${_component} ${_pkgconfig})
-		endif ()
-	endif (NOT WIN32)
+  if (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    if (PKG_CONFIG_FOUND)
+      pkg_check_modules(PC_${_component} ${_pkgconfig})
+    endif ()
+  endif (NOT WIN32)
 
-	find_path(${_component}_INCLUDE_DIRS ${_header}
-			HINTS
-			/opt/
-			/opt/include/
-			${PC_LIB${_component}_INCLUDEDIR}
-			${PC_LIB${_component}_INCLUDE_DIRS}
-			$ENV{FFMPEGDIR}/include/
-			$ENV{FFMPEGDIR}/include/ffmpeg/
-			PATH_SUFFIXES
-			ffmpeg
-			)
+  find_path(${_component}_INCLUDE_DIRS ${_header}
+      HINTS
+      /opt/
+      /opt/include/
+      ${PC_${_component}_INCLUDEDIR}
+      ${PC_${_component}_INCLUDE_DIRS}
+      $ENV{FFMPEGDIR}/include/
+      $ENV{FFMPEGDIR}/include/ffmpeg/
+      PATH_SUFFIXES
+      ffmpeg
+      )
 
-	find_library(${_component}_LIBRARIES NAMES ${_library}
-			HINTS
-			${PC_LIB${_component}_LIBDIR}
-			${PC_LIB${_component}_LIBRARY_DIRS}
-			$ENV{FFMPEGDIR}/lib/
-			$ENV{FFMPEGDIR}/lib/ffmpeg/
-			$ENV{FFMPEGDIR}/bin/
-			)
+  find_library(${_component}_LIBRARIES NAMES ${_library}
+      HINTS
+      ${PC_${_component}_LIBDIR}
+      ${PC_${_component}_LIBRARY_DIRS}
+      $ENV{FFMPEGDIR}/lib/
+      $ENV{FFMPEGDIR}/lib/ffmpeg/
+      $ENV{FFMPEGDIR}/bin/
+      )
 
-	set(${_component}_DEFINITIONS  ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
-	set(${_component}_VERSION      ${PC_${_component}_VERSION}      CACHE STRING "The ${_component} version number.")
+  set(${_component}_DEFINITIONS  ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
+  set(${_component}_VERSION      ${PC_${_component}_VERSION}      CACHE STRING "The ${_component} version number.")
 
-	set_component_found(${_component})
+  set_component_found(${_component})
 
-	mark_as_advanced(
-			${_component}_INCLUDE_DIRS
-			${_component}_LIBRARIES
-			${_component}_DEFINITIONS
-			${_component}_VERSION)
+  mark_as_advanced(
+      ${_component}_INCLUDE_DIRS
+      ${_component}_LIBRARIES
+      ${_component}_DEFINITIONS
+      ${_component}_VERSION)
 
 endmacro()
 
 
 # Check for cached results. If there are skip the costly part.
-if (NOT FFMPEG_LIBRARIES)
+if (NOT FFmpeg_LIBRARIES)
 
-	# Check for all possible component.
-	find_component(AVCODEC    libavcodec    avcodec  libavcodec/avcodec.h)
-	find_component(AVFORMAT   libavformat   avformat libavformat/avformat.h)
-	find_component(AVDEVICE   libavdevice   avdevice libavdevice/avdevice.h)
-	find_component(AVUTIL     libavutil     avutil   libavutil/avutil.h)
-	find_component(AVFILTER   libavfilter   avfilter libavfilter/avfilter.h)
-	find_component(SWSCALE    libswscale    swscale  libswscale/swscale.h)
-	find_component(POSTPROC   libpostproc   postproc libpostproc/postprocess.h)
-	find_component(SWRESAMPLE libswresample swresample libswresample/swresample.h)
-	find_component(AVRESAMPLE libavresample avresample libavresample/avresample.h)
+  # Check for all possible component.
+  find_component(avcodec    libavcodec    avcodec  libavcodec/avcodec.h)
+  find_component(avdevice   libavdevice   avdevice libavdevice/avdevice.h)
+  find_component(avformat   libavformat   avformat libavformat/avformat.h)
+  find_component(avfilter   libavfilter   avfilter libavfilter/avfilter.h)
+  find_component(avutil     libavutil     avutil   libavutil/avutil.h)
+  find_component(postproc   libpostproc   postproc libpostproc/postprocess.h)
+  find_component(swscale    libswscale    swscale  libswscale/swscale.h)
+  find_component(swresample libswresample swresample libswresample/swresample.h)
+  find_component(avresample libavresample avresample libavresample/avresample.h)
+else()
+  # Just set the noncached _FOUND vars for the components.
+  foreach(_component ${FFmpeg_ALL_COMPONENTS})
+    set_component_found(${_component})
+  endforeach ()
+endif()
 
-	# Check if the required components were found and add their stuff to the FFMPEG_* vars.
-	foreach (_component ${FFmpeg_FIND_COMPONENTS})
-		if (${_component}_FOUND)
-			# message(STATUS "Required component ${_component} present.")
-			set(FFMPEG_LIBRARIES   ${FFMPEG_LIBRARIES}   ${${_component}_LIBRARIES})
-			set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${_component}_DEFINITIONS})
-			list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS})
-		else ()
-			# message(STATUS "Required component ${_component} missing.")
-		endif ()
-	endforeach ()
-
-	# Build the include path with duplicates removed.
-	if (FFMPEG_INCLUDE_DIRS)
-		list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
-	endif ()
-
-	# cache the vars.
-	set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} CACHE STRING "The FFmpeg include directories." FORCE)
-	set(FFMPEG_LIBRARIES    ${FFMPEG_LIBRARIES}    CACHE STRING "The FFmpeg libraries." FORCE)
-	set(FFMPEG_DEFINITIONS  ${FFMPEG_DEFINITIONS}  CACHE STRING "The FFmpeg cflags." FORCE)
-
-	mark_as_advanced(FFMPEG_INCLUDE_DIRS
-			FFMPEG_LIBRARIES
-			FFMPEG_DEFINITIONS)
-
-endif ()
-
-# Now set the noncached _FOUND vars for the components.
-foreach (_component AVCODEC AVDEVICE AVFORMAT AVUTIL POSTPROCESS SWSCALE SWRESAMPLE AVRESAMPLE)
-	set_component_found(${_component})
+# Check if the requested components were found and add their stuff to the FFmpeg_* vars.
+foreach (_component ${FFmpeg_FIND_COMPONENTS})
+  string(TOLOWER "${_component}" _component)
+  if (${_component}_FOUND)
+		# message(STATUS "Requested component ${_component} present.")
+    set(FFmpeg_LIBRARIES   ${FFmpeg_LIBRARIES}   ${${_component}_LIBRARIES})
+    set(FFmpeg_DEFINITIONS ${FFmpeg_DEFINITIONS} ${${_component}_DEFINITIONS})
+    list(APPEND FFmpeg_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS})
+  else ()
+		# message(STATUS "Requested component ${_component} missing.")
+  endif ()
 endforeach ()
 
+# Build the include path with duplicates removed.
+if (FFmpeg_INCLUDE_DIRS)
+  list(REMOVE_DUPLICATES FFmpeg_INCLUDE_DIRS)
+endif ()
+
+# cache the vars.
+set(FFmpeg_INCLUDE_DIRS ${FFmpeg_INCLUDE_DIRS} CACHE STRING "The FFmpeg include directories." FORCE)
+set(FFmpeg_LIBRARIES    ${FFmpeg_LIBRARIES}    CACHE STRING "The FFmpeg libraries." FORCE)
+set(FFmpeg_DEFINITIONS  ${FFmpeg_DEFINITIONS}  CACHE STRING "The FFmpeg cflags." FORCE)
+
+mark_as_advanced(FFmpeg_INCLUDE_DIRS
+    FFmpeg_LIBRARIES
+    FFmpeg_DEFINITIONS)
+
+# Backwards compatibility
+foreach(_suffix INCLUDE_DIRS LIBRARIES DEFINITIONS)
+  get_property(_help CACHE FFmpeg_${_suffix} PROPERTY HELPSTRING)
+  set(FFMPEG_${_suffix} ${FFmpeg_${_suffix}} CACHE STRING "${_help}" FORCE)
+  mark_as_advanced(FFMPEG_${_suffix})
+endforeach()
+foreach(_component ${FFmpeg_ALL_COMPONENTS})
+  if(${_component}_FOUND)
+    string(TOUPPER "${_component}" _uc_component)
+    set(${_uc_component}_FOUND TRUE)
+    foreach(_suffix INCLUDE_DIRS LIBRARIES DEFINITIONS VERSION)
+      get_property(_help CACHE ${_component}_${_suffix} PROPERTY HELPSTRING)
+      set(${_uc_component}_${_suffix} ${${_component}_${_suffix}} CACHE STRING "${_help}" FORCE)
+      mark_as_advanced(${_uc_component}_${_suffix})
+    endforeach()
+  endif()
+endforeach()
+
 # Compile the list of required vars
-set(_FFmpeg_REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS)
+set(_FFmpeg_REQUIRED_VARS FFmpeg_LIBRARIES FFmpeg_INCLUDE_DIRS)
 foreach (_component ${FFmpeg_FIND_COMPONENTS})
-	list(APPEND _FFmpeg_REQUIRED_VARS ${_component}_LIBRARIES ${_component}_INCLUDE_DIRS)
+  list(APPEND _FFmpeg_REQUIRED_VARS ${_component}_LIBRARIES ${_component}_INCLUDE_DIRS)
 endforeach ()
 
 # Give a nice error message if some of the required vars are missing.
 find_package_handle_standard_args(FFmpeg DEFAULT_MSG ${_FFmpeg_REQUIRED_VARS})
+
+# Export targets for each found component
+foreach (_component ${FFmpeg_ALL_COMPONENTS})
+
+  if(${_component}_FOUND)
+		# message(STATUS "Creating IMPORTED target FFmpeg::${_component}")
+
+    if(NOT TARGET FFmpeg::${_component})
+      add_library(FFmpeg::${_component} UNKNOWN IMPORTED)
+
+      set_target_properties(FFmpeg::${_component} PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${${_component}_INCLUDE_DIRS}")
+
+      set_property(TARGET FFmpeg::${_component} APPEND PROPERTY
+        INTERFACE_COMPILE_DEFINITIONS "${${_component}_DEFINITIONS}")
+
+      set_property(TARGET FFmpeg::${_component} APPEND PROPERTY
+        IMPORTED_LOCATION "${${_component}_LIBRARIES}")
+    endif()
+
+  endif()
+
+endforeach()