Merge remote-tracking branch 'origin/master'

Browse Source

...

This commit is contained in:

Vadim Pisarevsky

2012-08-31 14:56:09 +04:00

parent 1fde184192 1a2bbfafba

commit 1686b0d9d3

2 changed files with 0 additions and 0 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

3rdparty/ffmpeg/opencv_ffmpeg.dll

Vendored

BIN

Binary file not shown.

3rdparty/ffmpeg/opencv_ffmpeg_64.dll

Vendored

BIN

Binary file not shown.