From 3f431a16a38be35e52b4887a3591d23030d34fc5 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 18 Nov 2019 18:56:57 +0000 Subject: [PATCH 1/2] videoio: fix ffmpeg wrapper build --- modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp index aa972b2b1c..fdc6b31b19 100644 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp @@ -1082,7 +1082,11 @@ bool CvCapture_FFMPEG::processRawPacket() const AVBitStreamFilter * bsf = av_bsf_get_by_name(filterName); if (!bsf) { +#ifdef __OPENCV_BUILD CV_WARN(cv::format("Bitstream filter is not available: %s", filterName).c_str()); +#else + CV_WARN("Bitstream filter is not available"); +#endif return false; } int err = av_bsf_alloc(bsf, &bsfc); @@ -1102,7 +1106,11 @@ bool CvCapture_FFMPEG::processRawPacket() bsfc = av_bitstream_filter_init(filterName); if (!bsfc) { +#ifdef __OPENCV_BUILD CV_WARN(cv::format("Bitstream filter is not available: %s", filterName).c_str()); +#else + CV_WARN("Bitstream filter is not available"); +#endif return false; } #endif From d00eb451bf17a7082277da27620cbc23438e2994 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 18 Nov 2019 19:13:45 +0000 Subject: [PATCH 2/2] ffmpeg/3.4: update FFmpeg wrapper --- 3rdparty/ffmpeg/ffmpeg.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/3rdparty/ffmpeg/ffmpeg.cmake b/3rdparty/ffmpeg/ffmpeg.cmake index ce73758696..81513655de 100644 --- a/3rdparty/ffmpeg/ffmpeg.cmake +++ b/3rdparty/ffmpeg/ffmpeg.cmake @@ -1,8 +1,8 @@ -# Binaries branch name: ffmpeg/3.4_20190905 -# Binaries were created for OpenCV: fafada28ebc0f2e5423a7d8ece425574ef01ff60 -ocv_update(FFMPEG_BINARIES_COMMIT "bf1730f4c4ba1996bed1fe268b52e4e942151cd6") -ocv_update(FFMPEG_FILE_HASH_BIN32 "6899624f88cb4cbb1604edc5e12b18ab") -ocv_update(FFMPEG_FILE_HASH_BIN64 "4729c052cb0c53ab56e9a0eed91559df") +# Binaries branch name: ffmpeg/3.4_20191118 +# Binaries were created for OpenCV: 3f431a16a38be35e52b4887a3591d23030d34fc5 +ocv_update(FFMPEG_BINARIES_COMMIT "548e3c997a80d65f710b9048f1d33371e3a203ac") +ocv_update(FFMPEG_FILE_HASH_BIN32 "168635a192fc2d2ae7d7d40150f0b349") +ocv_update(FFMPEG_FILE_HASH_BIN64 "cbc25f8f2954475b127c7558558c18e6") ocv_update(FFMPEG_FILE_HASH_CMAKE "3b90f67f4b429e77d3da36698cef700c") function(download_win_ffmpeg script_var)