diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ccb0700a1..a4c8cfceb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1636,7 +1636,6 @@ if(WITH_FFMPEG OR HAVE_FFMPEG) status(" avformat:" FFMPEG_libavformat_VERSION THEN "YES (${FFMPEG_libavformat_VERSION})" ELSE NO) status(" avutil:" FFMPEG_libavutil_VERSION THEN "YES (${FFMPEG_libavutil_VERSION})" ELSE NO) status(" swscale:" FFMPEG_libswscale_VERSION THEN "YES (${FFMPEG_libswscale_VERSION})" ELSE NO) - status(" avresample:" FFMPEG_libavresample_VERSION THEN "YES (${FFMPEG_libavresample_VERSION})" ELSE NO) if(OPENCV_FFMPEG_ENABLE_LIBAVDEVICE) status(" avdevice:" FFMPEG_libavdevice_VERSION THEN "YES (${FFMPEG_libavdevice_VERSION})" ELSE NO) endif() diff --git a/modules/videoio/cmake/detect_ffmpeg.cmake b/modules/videoio/cmake/detect_ffmpeg.cmake index aa669f36b0..1d4faa8394 100644 --- a/modules/videoio/cmake/detect_ffmpeg.cmake +++ b/modules/videoio/cmake/detect_ffmpeg.cmake @@ -27,11 +27,6 @@ set(_used_ffmpeg_libraries ${_required_ffmpeg_libraries}) if(NOT HAVE_FFMPEG AND PKG_CONFIG_FOUND) ocv_check_modules(FFMPEG libavcodec libavformat libavutil libswscale) if(FFMPEG_FOUND) - ocv_check_modules(FFMPEG_libavresample libavresample) # optional - if(FFMPEG_libavresample_FOUND) - list(APPEND FFMPEG_LIBRARIES ${FFMPEG_libavresample_LIBRARIES}) - list(APPEND _used_ffmpeg_libraries libavresample) - endif() if(OPENCV_FFMPEG_ENABLE_LIBAVDEVICE) ocv_check_modules(FFMPEG_libavdevice libavdevice) # optional if(FFMPEG_libavdevice_FOUND) @@ -60,7 +55,6 @@ if(HAVE_FFMPEG AND NOT HAVE_FFMPEG_WRAPPER) set(_min_libavformat_version 54.20.4) set(_min_libavutil_version 52.3.0) set(_min_libswscale_version 2.1.1) - set(_min_libavresample_version 1.0.1) set(_min_libavdevice_version 53.2.0) foreach(ffmpeg_lib ${_used_ffmpeg_libraries}) if(FFMPEG_${ffmpeg_lib}_VERSION VERSION_LESS _min_${ffmpeg_lib}_version) @@ -77,7 +71,6 @@ if(HAVE_FFMPEG AND NOT HAVE_FFMPEG_WRAPPER) unset(_min_libavformat_version) unset(_min_libavutil_version) unset(_min_libswscale_version) - unset(_min_libavresample_version) unset(_min_libavdevice_version) endif() diff --git a/modules/videoio/misc/plugin_ffmpeg/CMakeLists.txt b/modules/videoio/misc/plugin_ffmpeg/CMakeLists.txt index 204a425b17..212d8e8bba 100644 --- a/modules/videoio/misc/plugin_ffmpeg/CMakeLists.txt +++ b/modules/videoio/misc/plugin_ffmpeg/CMakeLists.txt @@ -15,7 +15,6 @@ message(STATUS "FFMPEG_libavcodec_VERSION=${FFMPEG_libavcodec_VERSION}") message(STATUS "FFMPEG_libavformat_VERSION=${FFMPEG_libavformat_VERSION}") message(STATUS "FFMPEG_libavutil_VERSION=${FFMPEG_libavutil_VERSION}") message(STATUS "FFMPEG_libswscale_VERSION=${FFMPEG_libswscale_VERSION}") -message(STATUS "FFMPEG_libavresample_VERSION=${FFMPEG_libavresample_VERSION}") if(OPENCV_FFMPEG_ENABLE_LIBAVDEVICE) message(STATUS "FFMPEG_libavdevice_VERSION=${FFMPEG_libavdevice_VERSION}") endif()