-
Vadim Pisarevsky authored
(cherry picked from commit 2b2e3ee9) 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
799622af