mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15939 from alalek:ffmpeg_update_3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2019-11-19 18:45:39 +00:00
commit 9d14c0b37a
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
3rdparty/ffmpeg/ffmpeg.cmake vendored
View File

@ -1,8 +1,8 @@
# Binaries branch name: ffmpeg/3.4_20190905 # Binaries branch name: ffmpeg/3.4_20191118
# Binaries were created for OpenCV: fafada28ebc0f2e5423a7d8ece425574ef01ff60 # Binaries were created for OpenCV: 3f431a16a38be35e52b4887a3591d23030d34fc5
ocv_update(FFMPEG_BINARIES_COMMIT "bf1730f4c4ba1996bed1fe268b52e4e942151cd6") ocv_update(FFMPEG_BINARIES_COMMIT "548e3c997a80d65f710b9048f1d33371e3a203ac")
ocv_update(FFMPEG_FILE_HASH_BIN32 "6899624f88cb4cbb1604edc5e12b18ab") ocv_update(FFMPEG_FILE_HASH_BIN32 "168635a192fc2d2ae7d7d40150f0b349")
ocv_update(FFMPEG_FILE_HASH_BIN64 "4729c052cb0c53ab56e9a0eed91559df") ocv_update(FFMPEG_FILE_HASH_BIN64 "cbc25f8f2954475b127c7558558c18e6")
ocv_update(FFMPEG_FILE_HASH_CMAKE "3b90f67f4b429e77d3da36698cef700c") ocv_update(FFMPEG_FILE_HASH_CMAKE "3b90f67f4b429e77d3da36698cef700c")
function(download_win_ffmpeg script_var) function(download_win_ffmpeg script_var)

8
modules/videoio/src/cap_ffmpeg_impl.hpp
View File

@ -1082,7 +1082,11 @@ bool CvCapture_FFMPEG::processRawPacket()
const AVBitStreamFilter * bsf = av_bsf_get_by_name(filterName); const AVBitStreamFilter * bsf = av_bsf_get_by_name(filterName);
if (!bsf) if (!bsf)
{ {
#ifdef __OPENCV_BUILD
CV_WARN(cv::format("Bitstream filter is not available: %s", filterName).c_str()); CV_WARN(cv::format("Bitstream filter is not available: %s", filterName).c_str());
#else
CV_WARN("Bitstream filter is not available");
#endif
return false; return false;
} }
int err = av_bsf_alloc(bsf, &bsfc); int err = av_bsf_alloc(bsf, &bsfc);
@ -1102,7 +1106,11 @@ bool CvCapture_FFMPEG::processRawPacket()
bsfc = av_bitstream_filter_init(filterName); bsfc = av_bitstream_filter_init(filterName);
if (!bsfc) if (!bsfc)
{ {
#ifdef __OPENCV_BUILD
CV_WARN(cv::format("Bitstream filter is not available: %s", filterName).c_str()); CV_WARN(cv::format("Bitstream filter is not available: %s", filterName).c_str());
#else
CV_WARN("Bitstream filter is not available");
#endif
return false; return false;
} }
#endif #endif