Merge pull request #7266 from alalek:pr7159

Browse Source

...

This commit is contained in:

Vadim Pisarevsky

2016-09-16 21:18:26 +00:00

parent d5c202e46b f85e33f4af

commit dc3d0cbc22

4 changed files with 1351 additions and 23 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/videoio/src/cap_avfoundation_mac.mm

+1322

File diff suppressed because it is too large Load Diff