diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-30 16:07:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-30 16:07:26 -0300 |
| commit | 0676b34e5c012f7bc63e2cac72401b3aed4c79ea (patch) | |
| tree | d71f317ac20a00dbec86ccac1f92d6c1c66552c4 | |
| parent | 8cd6a59c3237cf9b5d95aeb629f1de468c1771c0 (diff) | |
| download | mediapointer-dvb-s2-0676b34e5c012f7bc63e2cac72401b3aed4c79ea.tar.gz mediapointer-dvb-s2-0676b34e5c012f7bc63e2cac72401b3aed4c79ea.tar.bz2 | |
move V4L2_PIX_FMT_SGRBG8 to the proper place
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Instead of defining a new pif format on an internal header, move it to
the V4L2 API header.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/drivers/media/video/gspca/stv06xx/stv06xx.h | 4 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/linux/drivers/media/video/gspca/stv06xx/stv06xx.h b/linux/drivers/media/video/gspca/stv06xx/stv06xx.h index bb73c3288..bdea4dae2 100644 --- a/linux/drivers/media/video/gspca/stv06xx/stv06xx.h +++ b/linux/drivers/media/video/gspca/stv06xx/stv06xx.h @@ -37,10 +37,6 @@ #define STV_ISOC_ENDPOINT_ADDR 0x81 -#ifndef V4L2_PIX_FMT_SGRBG8 -#define V4L2_PIX_FMT_SGRBG8 v4l2_fourcc('G', 'R', 'B', 'G') -#endif - #define STV_REG23 0x0423 /* Control registers of the STV0600 ASIC */ diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 699ea62a7..7b0ab17cd 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -318,6 +318,8 @@ struct v4l2_pix_format { /* see http://www.siliconimaging.com/RGB%20Bayer.htm */ #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */ #define V4L2_PIX_FMT_SGBRG8 v4l2_fourcc('G', 'B', 'R', 'G') /* 8 GBGB.. RGRG.. */ +#define V4L2_PIX_FMT_SGRBG8 v4l2_fourcc('G', 'R', 'B', 'G') /* 8 GRGR.. BGBG.. */ + /* * 10bit raw bayer, expanded to 16 bits * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb... |