From 7ac6abe02a33bef445a5b77214ad31964e2c5cc1 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 3 Mar 2021 08:41:30 +0000 Subject: [PATCH] videoio(ffmpeg): fix VIDEO_ACCELERATION_ANY handling - default is VIDEO_ACCELERATION_NONE --- modules/videoio/src/cap_ffmpeg_hw.hpp | 2 +- modules/videoio/src/cap_ffmpeg_impl.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/videoio/src/cap_ffmpeg_hw.hpp b/modules/videoio/src/cap_ffmpeg_hw.hpp index 405e381231..6e4f71fd3d 100644 --- a/modules/videoio/src/cap_ffmpeg_hw.hpp +++ b/modules/videoio/src/cap_ffmpeg_hw.hpp @@ -486,7 +486,7 @@ public: if (va_type == VIDEO_ACCELERATION_ANY) { 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 << "'"); diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp index d30f3a450f..84e4e722f7 100644 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp @@ -572,7 +572,7 @@ void CvCapture_FFMPEG::init() memset(&packet_filtered, 0, sizeof(packet_filtered)); av_init_packet(&packet_filtered); bsfc = NULL; - va_type = cv::VIDEO_ACCELERATION_ANY; + va_type = cv::VIDEO_ACCELERATION_NONE; // TODO OpenCV 5.0: change to _ANY? hw_device = -1; }