potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages 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
parent 2f636b4456 d00eb451bf
commit 9d14c0b37a
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap_ffmpeg_impl.hpp
+8
View File
@@ -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