From 4830f27a40323fe859dc166337a2b861877b7121 Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Mon, 1 Jan 2018 13:40:09 +0100
Subject: sync with upstream

---
 cmake/modules/FindFFMPEG.cmake | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'cmake/modules/FindFFMPEG.cmake')

diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
index 02c8d28..689cf28 100644
--- a/cmake/modules/FindFFMPEG.cmake
+++ b/cmake/modules/FindFFMPEG.cmake
@@ -33,14 +33,14 @@
 #
 
 # required ffmpeg library versions
-set(REQUIRED_FFMPEG_VERSION 3.3)
-set(_avcodec_ver ">=57.89.100")
-set(_avfilter_ver ">=6.82.100")
-set(_avformat_ver ">=57.71.100")
-set(_avutil_ver ">=55.58.100")
-set(_swscale_ver ">=4.6.100")
-set(_swresample_ver ">=2.7.100")
-set(_postproc_ver ">=54.5.100")
+set(REQUIRED_FFMPEG_VERSION 3.4)
+set(_avcodec_ver ">=57.107.100")
+set(_avfilter_ver ">=6.107.100")
+set(_avformat_ver ">=57.83.100")
+set(_avutil_ver ">=55.78.100")
+set(_swscale_ver ">=4.8.100")
+set(_swresample_ver ">=2.9.100")
+set(_postproc_ver ">=54.7.100")
 
 
 # Allows building with external ffmpeg not found in system paths,
@@ -266,7 +266,7 @@ if(NOT FFMPEG_FOUND)
 
   file(WRITE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ffmpeg/ffmpeg-link-wrapper
 "#!/bin/bash
-if [[ $@ == *${APP_NAME_LC}.bin* || $@ == *${APP_NAME_LC}.so* || $@ == *${APP_NAME_LC}-test* ]]
+if [[ $@ == *${APP_NAME_LC}.bin* || $@ == *${APP_NAME_LC}${APP_BINARY_SUFFIX}* || $@ == *${APP_NAME_LC}.so* || $@ == *${APP_NAME_LC}-test* ]]
 then
   avformat=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavcodec`
   avcodec=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavformat`
-- 
cgit v1.2.3