diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 15:24:02 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 15:24:02 -0400 |
| commit | db0a2901a32c44510d7d429358d017143a649a70 (patch) | |
| tree | 4e4e41cf2e27aa4940f9c0711ca2a3bf7557a805 /include/linux | |
| parent | d210baf53b699fc61aa891c177b71d7082d3b957 (diff) | |
| parent | 4cce1655b26a4df1e619b2aa3d2eea1b7a6e906c (diff) | |
Merge branch 'fixes_stg' of ../git_old into fixes
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/videodev2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index e65a6bed4e3e..303d93ffd6b2 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -334,6 +334,8 @@ struct v4l2_pix_format { | |||
| 334 | #define V4L2_PIX_FMT_SPCA508 v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */ | 334 | #define V4L2_PIX_FMT_SPCA508 v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */ |
| 335 | #define V4L2_PIX_FMT_SPCA561 v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */ | 335 | #define V4L2_PIX_FMT_SPCA561 v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */ |
| 336 | #define V4L2_PIX_FMT_PAC207 v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */ | 336 | #define V4L2_PIX_FMT_PAC207 v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */ |
| 337 | #define V4L2_PIX_FMT_PJPG v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */ | ||
| 338 | #define V4L2_PIX_FMT_YVYU v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */ | ||
| 337 | 339 | ||
| 338 | /* | 340 | /* |
| 339 | * F O R M A T E N U M E R A T I O N | 341 | * F O R M A T E N U M E R A T I O N |