generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get back to single-version ffmpeg wrapper (no more v2); make sure the library builds and the tests pass on Ubuntu 10.04 that includes pretty old version of ffmpeg

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-04-30 12:39:49 +00:00
parent 2c88791600
commit 4a34487a03
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/ffmpeg/ffopencv.c vendored
View File

@ -1 +1 @@
#include "cap_ffmpeg_impl_v2.hpp"
#include "cap_ffmpeg_impl.hpp"

9
CMakeLists.txt
View File

@ -369,7 +369,7 @@ if(UNIX)
endif()
endif()
if(HAVE_FFMPEG_CODEC AND HAVE_FFMPEG_FORMAT AND HAVE_FFMPEG_UTIL)
if(HAVE_FFMPEG_SWSCALE OR NOT HAVE_GENTOO_FFMPEG)
if(HAVE_FFMPEG_SWSCALE)
set(HAVE_FFMPEG 1)
endif()
endif()
@ -382,12 +382,6 @@ if(UNIX)
endif()
endif()
if(HAVE_FFMPEG)
if(NOT ALIASOF_libavformat_VERSION VERSION_LESS "52.111.0")
set(NEW_FFMPEG ON)
endif()
endif()
if(WITH_1394)
CHECK_MODULE(libdc1394-2 HAVE_DC1394_2)
if(NOT HAVE_DC1394_2)
@ -455,7 +449,6 @@ if(APPLE AND WITH_FFMPEG)
"${FFMPEG_LIB_DIR}/libavformat.a" "${FFMPEG_LIB_DIR}/libavutil.a"
"${FFMPEG_LIB_DIR}/libswscale.a")
set(HAVE_FFMPEG 1)
set(NEW_FFMPEG 1)
endif()
endif()
endif()