Merge remote-tracking branch 'upstream/master'

2015-03-07 13:10:41 +01:00
parent 9f1eb70dbc 361eb633f6
commit 5e3d986ad8
211 changed files with 9070 additions and 707 deletions
--- a/modules/videoio/include/opencv2/videoio.hpp
+++ b/modules/videoio/include/opencv2/videoio.hpp
@@ -135,7 +135,8 @@ enum { CAP_PROP_POS_MSEC       =0,
 // Currently, these are supported through the libv4l interface only.
 enum { CAP_MODE_BGR  = 0, // BGR24 (default)
       CAP_MODE_RGB  = 1, // RGB24
-       CAP_MODE_GRAY = 2  // Y8
+       CAP_MODE_GRAY = 2, // Y8
+       CAP_MODE_YUYV = 3  // YUYV
     };