mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-09 18:43:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19667 from alalek:hotfix_ffmpeg_hw_accel

Browse Source
This commit is contained in:
Alexander Alekhin 2021-03-03 11:08:55 +00:00
commit d2ac304ade
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/videoio/src/cap_ffmpeg_hw.hpp
View File

@ -486,7 +486,7 @@ public:
if (va_type == VIDEO_ACCELERATION_ANY) if (va_type == VIDEO_ACCELERATION_ANY)
{ {
if (!accel_list.empty()) if (!accel_list.empty())
accel_list = ","; // add no-acceleration case to the end of the list accel_list += ","; // add no-acceleration case to the end of the list
} }
CV_LOG_DEBUG(NULL, "FFMPEG: allowed acceleration types (" << getVideoAccelerationName(va_type) << "): '" << accel_list << "'"); CV_LOG_DEBUG(NULL, "FFMPEG: allowed acceleration types (" << getVideoAccelerationName(va_type) << "): '" << accel_list << "'");

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

@ -572,7 +572,7 @@ void CvCapture_FFMPEG::init()
memset(&packet_filtered, 0, sizeof(packet_filtered)); memset(&packet_filtered, 0, sizeof(packet_filtered));
av_init_packet(&packet_filtered); av_init_packet(&packet_filtered);
bsfc = NULL; bsfc = NULL;
va_type = cv::VIDEO_ACCELERATION_ANY; va_type = cv::VIDEO_ACCELERATION_NONE; // TODO OpenCV 5.0: change to _ANY?
hw_device = -1; hw_device = -1;
} }