Merge pull request #1986 from GregoryMorse:patch-3

Browse Source

...

This commit is contained in:

Roman Donchenko

2014-03-18 16:18:32 +04:00

committed by OpenCV Buildbot

parent 6e44f05e6f 90920c2376

commit b70332d806

4 changed files with 10230 additions and 70 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

modules/highgui/src/cap_msmf.cpp

+713 -70

File diff suppressed because it is too large Load Diff

modules/highgui/src/cap_msmf.hpp

+3187

File diff suppressed because it is too large Load Diff

modules/highgui/src/ppltasks_winrt.h

+6326

File diff suppressed because it is too large Load Diff