Merge pull request #6105 from mshabunin:tutorial-folder-correction

Browse Source

...

This commit is contained in:

Maksim Shabunin

2016-02-15 13:10:44 +00:00

parent 28dd315ef3 6c0c0466c6

commit 8c29380471

24 changed files with 53 additions and 42 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

BIN

samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind.avi

Binary file not shown.

BIN

samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind_bugy.avi

Binary file not shown.

0

samples/cpp/tutorial_code/HighGUI/GDAL_IO/gdal-image.cpp → samples/cpp/tutorial_code/imgcodecs/GDAL_IO/gdal-image.cpp

0

samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video-input-psnr-ssim.cpp → samples/cpp/tutorial_code/videoio/video-input-psnr-ssim/video-input-psnr-ssim.cpp

0

samples/cpp/tutorial_code/HighGUI/video-write/video-write.cpp → samples/cpp/tutorial_code/videoio/video-write/video-write.cpp