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 branch 4.x

Browse Source
This commit is contained in:
Alexander Alekhin
2023-01-28 13:08:29 +00:00
parent 8329c09ba8 cd44aa0bb1
commit f33598f55e
91 changed files with 1245 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/test/test_video_io.cpp
+2
View File
@@ -388,6 +388,7 @@ static Ext_Fourcc_PSNR synthetic_params[] = {
{"wmv", "WMV3", 30.f, CAP_MSMF},
{"wmv", "WVC1", 30.f, CAP_MSMF},
{"mov", "H264", 30.f, CAP_MSMF},
// {"mov", "HEVC", 30.f, CAP_MSMF}, // excluded due to CI issue: https://github.com/opencv/opencv/pull/23172
#endif
#ifdef HAVE_AVFOUNDATION
@@ -995,6 +996,7 @@ static Ext_Fourcc_PSNR hw_codecs[] = {
#ifdef _WIN32
{"mp4", "MPEG", 29.f, CAP_MSMF},
{"mp4", "H264", 29.f, CAP_MSMF},
{"mp4", "HEVC", 29.f, CAP_MSMF},
#endif
};