selim/ffconv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed problem with finding ffmpeg on linux and macos

Browse Source
This commit is contained in:
selim mustafaev 2017-11-20 01:47:39 +03:00
parent edb103651e
commit e22a2678da
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmake/modules/FindFFMPEG.cmake
View File

@ -119,29 +119,7 @@ find_path(FFMPEG_INCLUDE_DIR6 swresample.h
) )
if(FFMPEG_INCLUDE_DIR1) if(FFMPEG_INCLUDE_DIR1)
if(FFMPEG_INCLUDE_DIR2) set(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR1})
if(FFMPEG_INCLUDE_DIR3)
set(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR1}
${FFMPEG_INCLUDE_DIR2}
${FFMPEG_INCLUDE_DIR3})
endif()
endif()
endif()
if(FFMPEG_INCLUDE_DIR4)
set(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR}
${FFMPEG_INCLUDE_DIR4})
endif()
if(FFMPEG_INCLUDE_DIR5)
set(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR}
${FFMPEG_INCLUDE_DIR5}
${FFMPEG_INCLUDE_DIR5}/..)
endif()
if(FFMPEG_INCLUDE_DIR6)
set(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR}
${FFMPEG_INCLUDE_DIR6})
endif() endif()
find_library(FFMPEG_avformat_LIBRARY avformat find_library(FFMPEG_avformat_LIBRARY avformat
@ -292,4 +270,4 @@ endif()
if(COMMAND set_package_properties) if(COMMAND set_package_properties)
set_package_properties(FFMPEG PROPERTIES DESCRIPTION "A complete, cross-platform solution to record, convert and stream audio and video") set_package_properties(FFMPEG PROPERTIES DESCRIPTION "A complete, cross-platform solution to record, convert and stream audio and video")
set_package_properties(FFMPEG PROPERTIES URL "http://ffmpeg.org/") set_package_properties(FFMPEG PROPERTIES URL "http://ffmpeg.org/")
endif() endif()