From 56dd7eda0d6a5ad1c5bec5ebc08739e331b7bf91 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sun, 18 Oct 2015 13:37:31 +0200 Subject: [PATCH] remove additional V4L2 pixelformat defines they are upstream since at least linux 2.6.8 (10 Years) http://lxr.oss.org.cn/ident?v=2.6.8&i=V4L2_PIX_FMT_SBGGR8 --- modules/videoio/src/cap_v4l.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/modules/videoio/src/cap_v4l.cpp b/modules/videoio/src/cap_v4l.cpp index 3547f98b1..8160a0c6e 100644 --- a/modules/videoio/src/cap_v4l.cpp +++ b/modules/videoio/src/cap_v4l.cpp @@ -272,18 +272,6 @@ struct buffer static unsigned int n_buffers = 0; -/* Additional V4L2 pixelformats support for Sonix SN9C10x base webcams */ -#ifndef V4L2_PIX_FMT_SBGGR8 -#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */ -#endif -#ifndef V4L2_PIX_FMT_SN9C10X -#define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') /* SN9C10x cmpr. */ -#endif - -#ifndef V4L2_PIX_FMT_SGBRG8 -#define V4L2_PIX_FMT_SGBRG8 v4l2_fourcc('G','B','R','G') /* bayer GBRG GBGB.. RGRG.. */ -#endif - #endif /* HAVE_CAMV4L2 */ typedef struct CvCaptureCAM_V4L