mirror of
https://github.com/opencv/opencv.git
synced 2026-11-22 09:23:44 -06:00
(cherry picked from commit 2b2e3ee93c)
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
modules/videoio/src/cap.cpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
modules/videoio/test/test_ffmpeg.cpp