2016-12-04 03:35:58 +01:00
|
|
|
diff -urNB kfilemetadata/cmake/FindFFmpeg.cmake new/cmake/FindFFmpeg.cmake
|
|
|
|
|
--- kfilemetadata/cmake/FindFFmpeg.cmake 2016-11-21 20:58:44.371788460 +0100
|
|
|
|
|
+++ new/cmake/FindFFmpeg.cmake 2016-11-21 20:59:09.591943836 +0100
|
2016-04-17 22:59:17 +02:00
|
|
|
@@ -9,11 +9,8 @@
|
|
|
|
|
#
|
|
|
|
|
# For each of the components it will additionally set.
|
|
|
|
|
# - AVCODEC
|
|
|
|
|
-# - AVDEVICE
|
|
|
|
|
# - AVFORMAT
|
|
|
|
|
# - AVUTIL
|
|
|
|
|
-# - POSTPROCESS
|
|
|
|
|
-# - SWSCALE
|
|
|
|
|
# the following variables will be defined
|
|
|
|
|
# <component>_FOUND - System has <component>
|
|
|
|
|
# <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers
|
2016-12-04 03:35:58 +01:00
|
|
|
@@ -121,10 +118,7 @@
|
2016-04-17 22:59:17 +02:00
|
|
|
# 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(SWSCALE libswscale swscale libswscale/swscale.h)
|
2016-12-04 03:35:58 +01:00
|
|
|
- find_component(POSTPROCESS libpostproc postproc libpostproc/postprocess.h)
|
2016-04-17 22:59:17 +02:00
|
|
|
|
|
|
|
|
# Check if the required components were found and add their stuff to the FFMPEG_* vars.
|
|
|
|
|
foreach (_component ${FFmpeg_FIND_COMPONENTS})
|
2016-12-04 03:35:58 +01:00
|
|
|
@@ -155,7 +149,7 @@
|
2016-04-17 22:59:17 +02:00
|
|
|
endif ()
|
|
|
|
|
|
|
|
|
|
# Now set the noncached _FOUND vars for the components.
|
|
|
|
|
-foreach (_component AVCODEC AVDEVICE AVFORMAT AVUTIL POSTPROCESS SWSCALE)
|
|
|
|
|
+foreach (_component AVCODEC AVFORMAT AVUTIL)
|
|
|
|
|
set_component_found(${_component})
|
|
|
|
|
endforeach ()
|
|
|
|
|
|
