Skip to content

O
opencv
Commit 98a157f5 authored by Mansour Moufid's avatar Mansour Moufid
Browse files
Options

Remove Apple-specific logic in finding the FFmpeg libraries. 

Thanks to SpecLad.
parent a1cc9380
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
cmake/OpenCVFindLibsVideo.cmake
View file @ 98a157f5
...@@ -218,10 +218,7 @@ if(WITH_FFMPEG) ...@@ -218,10 +218,7 @@ if(WITH_FFMPEG)
# Do an other trial # Do an other trial
FIND_FILE(BZIP2_LIBRARIES NAMES libbz2.so.1 PATHS /lib) FIND_FILE(BZIP2_LIBRARIES NAMES libbz2.so.1 PATHS /lib)
endif() endif()
endif(HAVE_FFMPEG) else()
endif()
if(APPLE)
find_path(FFMPEG_INCLUDE_DIR "libavformat/avformat.h" find_path(FFMPEG_INCLUDE_DIR "libavformat/avformat.h"
PATHS /usr/local /usr /opt PATHS /usr/local /usr /opt
PATH_SUFFIXES include PATH_SUFFIXES include
...@@ -244,7 +241,8 @@ if(WITH_FFMPEG) ...@@ -244,7 +241,8 @@ if(WITH_FFMPEG)
${FFMPEG_UTIL_LIB} ${FFMPEG_SWSCALE_LIB}) ${FFMPEG_UTIL_LIB} ${FFMPEG_SWSCALE_LIB})
ocv_include_directories(${FFMPEG_INCLUDE_DIR}) ocv_include_directories(${FFMPEG_INCLUDE_DIR})
endif() endif()
endif(APPLE) endif()
endif()
endif(WITH_FFMPEG) endif(WITH_FFMPEG)
# --- VideoInput/DirectShow --- # --- VideoInput/DirectShow ---
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment