projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a1cc938
)
Remove Apple-specific logic in finding the FFmpeg libraries.
author
Mansour Moufid
<mansourmoufid@gmail.com>
Wed, 4 Feb 2015 04:12:50 +0000
(23:12 -0500)
committer
Mansour Moufid
<mansourmoufid@gmail.com>
Wed, 4 Feb 2015 04:14:11 +0000
(23:14 -0500)
Thanks to SpecLad.
cmake/OpenCVFindLibsVideo.cmake
patch
|
blob
|
history
diff --git
a/cmake/OpenCVFindLibsVideo.cmake
b/cmake/OpenCVFindLibsVideo.cmake
index
9a71220
..
c0ca0a3
100644
(file)
--- a/
cmake/OpenCVFindLibsVideo.cmake
+++ b/
cmake/OpenCVFindLibsVideo.cmake
@@
-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 ---