Skip to content

Commit 7ac6abe

Browse files
committed
videoio(ffmpeg): fix VIDEO_ACCELERATION_ANY handling
- default is VIDEO_ACCELERATION_NONE
1 parent 6af20d3 commit 7ac6abe

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

modules/videoio/src/cap_ffmpeg_hw.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ class HWAccelIterator {
486486
if (va_type == VIDEO_ACCELERATION_ANY)
487487
{
488488
if (!accel_list.empty())
489-
accel_list = ","; // add no-acceleration case to the end of the list
489+
accel_list += ","; // add no-acceleration case to the end of the list
490490
}
491491
CV_LOG_DEBUG(NULL, "FFMPEG: allowed acceleration types (" << getVideoAccelerationName(va_type) << "): '" << accel_list << "'");
492492

modules/videoio/src/cap_ffmpeg_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ void CvCapture_FFMPEG::init()
572572
memset(&packet_filtered, 0, sizeof(packet_filtered));
573573
av_init_packet(&packet_filtered);
574574
bsfc = NULL;
575-
va_type = cv::VIDEO_ACCELERATION_ANY;
575+
va_type = cv::VIDEO_ACCELERATION_NONE; // TODO OpenCV 5.0: change to _ANY?
576576
hw_device = -1;
577577
}
578578

0 commit comments

Comments
 (0)