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

FFmpeg binaries update for Windows.

Browse Source
This commit is contained in:
Alexander Smorkalov
2025-12-25 17:43:02 +03:00
parent cff7581175
commit 497e9037b4
2 changed files with 5 additions and 12 deletions
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_20250625 # Binaries branch name: ffmpeg/4.x_20251226
# Binaries were created for OpenCV: e9f1da7e8e977a65b8bf8fe7ea8b92eef9171f19 # Binaries were created for OpenCV: cff7581175d2abfc6aef2e4f04f482e258b5c864
ocv_update(FFMPEG_BINARIES_COMMIT "ea9240e39bc0d6a69d2b1f0ba4513bdc7612a41e") ocv_update(FFMPEG_BINARIES_COMMIT "d82ad9a54a7b42a1648a9cae8fed5c2f20ea396c")
ocv_update(FFMPEG_FILE_HASH_BIN32 "2821ea672a11147a70974d760a54e9bc") ocv_update(FFMPEG_FILE_HASH_BIN32 "47730de2286110b0d1250ff9cf50ce56")
ocv_update(FFMPEG_FILE_HASH_BIN64 "e5c6936240201064b15bcecf1816e8f4") ocv_update(FFMPEG_FILE_HASH_BIN64 "3248b4663ffef770cdb54ec8b9d16a28")
ocv_update(FFMPEG_FILE_HASH_CMAKE "8862c87496e2e8c375965e1277dee1c7") ocv_update(FFMPEG_FILE_HASH_CMAKE "8862c87496e2e8c375965e1277dee1c7")
function(download_win_ffmpeg script_var) function(download_win_ffmpeg script_var)

7
modules/videoio/test/test_ffmpeg.cpp
View File

@@ -1030,10 +1030,6 @@ inline static std::string videoio_ffmpeg_mismatch_name_printer(const testing::Te
INSTANTIATE_TEST_CASE_P(/**/, videoio_ffmpeg_channel_mismatch, testing::ValuesIn(mismatch_cases), videoio_ffmpeg_mismatch_name_printer); INSTANTIATE_TEST_CASE_P(/**/, videoio_ffmpeg_channel_mismatch, testing::ValuesIn(mismatch_cases), videoio_ffmpeg_mismatch_name_printer);
// PR: https://github.com/opencv/opencv/pull/27523
// TODO: Enable the tests back on Windows after FFmpeg plugin rebuild
#ifndef _WIN32
// related issue: https://github.com/opencv/opencv/issues/23088 // related issue: https://github.com/opencv/opencv/issues/23088
TEST(ffmpeg_cap_properties, set_pos_get_msec) TEST(ffmpeg_cap_properties, set_pos_get_msec)
{ {
@@ -1111,7 +1107,4 @@ TEST(videoio_ffmpeg, seek_with_negative_dts)
} }
} }
#endif // WIN32
}} // namespace }} // namespace