OSSForks/opencv
1
0
Fork 0
mirror of https://github.com/zebrajr/opencv.git synced 2025-12-06 12:19:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27481 from opencv-pushbot:gitee/alalek/update_ffmpeg_4.x

Browse Source 
ffmpeg/4.x: update FFmpeg wrapper 2025.06
This commit is contained in:
Alexander Smorkalov 2025-06-26 08:26:49 +03:00 committed by GitHub
commit 856a497209
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
3rdparty/ffmpeg/ffmpeg.cmake vendored
View File

@ -1,8 +1,8 @@
# Binaries branch name: ffmpeg/4.x_20241226
# Binaries were created for OpenCV: 09892c9d1706f40342bda0bc404580f63492d9f8
ocv_update(FFMPEG_BINARIES_COMMIT "d63d7c154c57242bf2283be61166be2bd30ec47e")
ocv_update(FFMPEG_FILE_HASH_BIN32 "642b94d032a8292b07550126934173f6")
ocv_update(FFMPEG_FILE_HASH_BIN64 "a8c3560c8f20e1ae465bef81580fa92c")
# Binaries branch name: ffmpeg/4.x_20250625
# Binaries were created for OpenCV: e9f1da7e8e977a65b8bf8fe7ea8b92eef9171f19
ocv_update(FFMPEG_BINARIES_COMMIT "ea9240e39bc0d6a69d2b1f0ba4513bdc7612a41e")
ocv_update(FFMPEG_FILE_HASH_BIN32 "2821ea672a11147a70974d760a54e9bc")
ocv_update(FFMPEG_FILE_HASH_BIN64 "e5c6936240201064b15bcecf1816e8f4")
ocv_update(FFMPEG_FILE_HASH_CMAKE "8862c87496e2e8c375965e1277dee1c7")
function(download_win_ffmpeg script_var)

6
modules/videoio/test/test_orientation.cpp
View File

@ -8,10 +8,6 @@ using namespace std;
namespace opencv_test { namespace {
// PR: https://github.com/opencv/opencv/pull/26800
// TODO: Enable the tests back on Windows after FFmpeg plugin rebuild
#ifndef _WIN32
struct VideoCaptureAPITests: TestWithParam<cv::VideoCaptureAPIs>
{
void SetUp()
@ -89,6 +85,4 @@ inline static std::string VideoCaptureAPITests_name_printer(const testing::TestP
INSTANTIATE_TEST_CASE_P(videoio, VideoCaptureAPITests, testing::ValuesIn(supported_backends), VideoCaptureAPITests_name_printer);
#endif // WIN32
}} // namespace