merged all the latest changes from 2.4 to trunk
This commit is contained in:
2
3rdparty/ffmpeg/ffopencv.c
vendored
2
3rdparty/ffmpeg/ffopencv.c
vendored
@@ -1 +1 @@
|
||||
#include "cap_ffmpeg_impl.hpp"
|
||||
#include "cap_ffmpeg_impl_v2.hpp"
|
||||
|
Reference in New Issue
Block a user