merged the latest fixes in 2.3 to trunk

This commit is contained in:
Vadim Pisarevsky
2011-07-04 16:18:12 +00:00
parent 55ba0af2bc
commit b33224f0b6
29 changed files with 1930 additions and 2943 deletions

1
3rdparty/ffmpeg/ffopencv.c vendored Normal file
View File

@@ -0,0 +1 @@
#include "cap_ffmpeg_impl.hpp"