generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1845 from StevenPuttemans:bugfix_3306

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-11-29 23:08:20 +04:00
committed by OpenCV Buildbot
parent f8801cfdb8 1b0297d92b
commit 429ab8ebee
2 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/doc/reading_and_writing_images_and_video.rst
View File

@@ -253,7 +253,7 @@ VideoCapture constructors.
.. ocv:cfunction:: CvCapture* cvCaptureFromFile( const char* filename )
.. ocv:pyoldfunction:: cv.CaptureFromFile(filename) -> CvCapture
:param filename: name of the opened video file
:param filename: name of the opened video file (eg. video.avi) or image sequence (eg. img_%02d.jpg, which will read samples like img_00.jpg, img_01.jpg, img_02.jpg, ...)
:param device: id of the opened video capturing device (i.e. a camera index). If there is a single camera connected, just pass 0.
@@ -270,7 +270,7 @@ Open video file or a capturing device for video capturing
.. ocv:pyfunction:: cv2.VideoCapture.open(filename) -> retval
.. ocv:pyfunction:: cv2.VideoCapture.open(device) -> retval
:param filename: name of the opened video file
:param filename: name of the opened video file (eg. video.avi) or image sequence (eg. img_%02d.jpg, which will read samples like img_00.jpg, img_01.jpg, img_02.jpg, ...)
:param device: id of the opened video capturing device (i.e. a camera index).