mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 21:20:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove Apple-specific logic in finding the FFmpeg libraries.

Browse Source 
Thanks to SpecLad.
This commit is contained in:
Mansour Moufid 2015-02-03 23:12:50 -05:00
parent a1cc9380e5
commit 98a157f589
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/OpenCVFindLibsVideo.cmake
View File

@ -218,10 +218,7 @@ if(WITH_FFMPEG)
# Do an other trial
FIND_FILE(BZIP2_LIBRARIES NAMES libbz2.so.1 PATHS /lib)
endif()
endif(HAVE_FFMPEG)
endif()
if(APPLE)
else()
find_path(FFMPEG_INCLUDE_DIR "libavformat/avformat.h"
PATHS /usr/local /usr /opt
PATH_SUFFIXES include
@ -244,7 +241,8 @@ if(WITH_FFMPEG)
${FFMPEG_UTIL_LIB} ${FFMPEG_SWSCALE_LIB})
ocv_include_directories(${FFMPEG_INCLUDE_DIR})
endif()
endif(APPLE)
endif()
endif()
endif(WITH_FFMPEG)
# --- VideoInput/DirectShow ---