Merge remote-tracking branch 'origin/master'

1686b0d9 · Vadim Pisarevsky · 1fde1841 · 1a2bbfaf · 1686b0d9 · 1686b0d9
Commit 1686b0d9 authored Aug 31, 2012 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

opencv_ffmpeg.dll 3rdparty/ffmpeg/opencv_ffmpeg.dll +0 -0

opencv_ffmpeg_64.dll 3rdparty/ffmpeg/opencv_ffmpeg_64.dll +0 -0

No files found.
--- a/3rdparty/ffmpeg/opencv_ffmpeg.dll
+++ b/3rdparty/ffmpeg/opencv_ffmpeg.dll
--- a/3rdparty/ffmpeg/opencv_ffmpeg_64.dll
+++ b/3rdparty/ffmpeg/opencv_ffmpeg_64.dll