adding extra buffer parameter

Conflicts:
	modules/highgui/include/opencv2/highgui/highgui_c.h
	modules/highgui/src/cap_dc1394_v2.cpp

fix typo
This commit is contained in:
StevenPuttemans
2014-11-12 10:48:24 +01:00
committed by Dikay900
parent 6aedd4f7b0
commit 8454a8f2d1
2 changed files with 7 additions and 0 deletions

View File

@@ -183,6 +183,7 @@ enum
CV_CAP_PROP_ROLL =35,
CV_CAP_PROP_IRIS =36,
CV_CAP_PROP_SETTINGS =37,
CV_CAP_PROP_BUFFERSIZE =38,
CV_CAP_PROP_AUTOGRAB =1024, // property for videoio class CvCapture_Android only
CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING=1025, // readonly, tricky property, returns cpnst char* indeed