squashed #823
authorKevin Hughes <kevin@kevin-M3920.(none)>
Wed, 17 Apr 2013 17:20:32 +0000 (13:20 -0400)
committerDikay900 <dark900@xyz.de>
Fri, 24 Apr 2015 19:58:14 +0000 (21:58 +0200)
commitac3ec0d96d140ba71b2b5524c00bd7e38156a5f8
treee243f052a8822987d5141c568b6231328f4881ce
parent5c6c53704440c0b7ccad4956a24bbadf21febd7a
squashed #823
removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface

Conflicts:
modules/highgui/doc/reading_and_writing_images_and_video.rst
samples/cpp/starter_video.cpp

starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error

starter_video.cpp hid local functions
modules/highgui/doc/reading_and_writing_images_and_video.rst
samples/cpp/starter_video.cpp