diff --git a/3rdparty/ffmpeg/ffopencv.c b/3rdparty/ffmpeg/ffopencv.c index 82ac06037..b412e9007 100644 --- a/3rdparty/ffmpeg/ffopencv.c +++ b/3rdparty/ffmpeg/ffopencv.c @@ -1 +1 @@ -#include "cap_ffmpeg_impl_v2.hpp" +#include "cap_ffmpeg_impl.hpp" diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dde2a098..0b5c97724 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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()