Update OpenCV to upstream version to get FFmpeg 5 fixes.

4510a683 · Alexander Smorkalov · 8f717029 · 4510a683 · ab912329 · b0dc4741
隐藏空白更改
内联并排

Showing with 4 addition and 4 deletion

.github/workflows/build_wheels_macos.yml .github/workflows/build_wheels_macos.yml +1 -1

opencv opencv +1 -1

opencv_contrib opencv_contrib +1 -1

opencv_extra opencv_extra +1 -1

未找到文件。
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -45,7 +45,7 @@ jobs:
      USE_CCACHE: 1
      UNICODE_WIDTH: 32
      PLAT: x86_64
-      FFMPEG_FORMULA_VERSION: '@5'
+      FFMPEG_FORMULA_VERSION: ''
      SDIST: ${{ matrix.build_sdist || 0 }}
      ENABLE_HEADLESS: ${{ matrix.without_gui }}
      ENABLE_CONTRIB: ${{ matrix.with_contrib }}

--- a/opencv @ ab912329
+++ b/opencv @ ab912329
-Subproject commit b0dc474160e389b9c9045da5db49d03ae17c6a6b
+Subproject commit ab912329b67d3a142a1b399b4bc9fa9b68cd8df6
--- a/opencv_contrib @ d6102ef6
+++ b/opencv_contrib @ d6102ef6
-Subproject commit db16caf6ceee76b43b94c846be276e92a43e9700
+Subproject commit d6102ef65f9ccdb37bba0ea9b8254951eb89dc39
--- a/opencv_extra @ 531785fb
+++ b/opencv_extra @ 531785fb
-Subproject commit 936854e2b666853d6d0732a8eabc2d699f4fa3d8
+Subproject commit 531785fb1a42b2665e0e06c8b191de58db6deb10