diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /include/media/v4l2-mediabus.h | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'include/media/v4l2-mediabus.h')
| -rw-r--r-- | include/media/v4l2-mediabus.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h index f0cf2e7def06..8e6559838ae3 100644 --- a/include/media/v4l2-mediabus.h +++ b/include/media/v4l2-mediabus.h | |||
| @@ -28,10 +28,18 @@ enum v4l2_mbus_pixelcode { | |||
| 28 | V4L2_MBUS_FMT_YVYU8_2X8, | 28 | V4L2_MBUS_FMT_YVYU8_2X8, |
| 29 | V4L2_MBUS_FMT_UYVY8_2X8, | 29 | V4L2_MBUS_FMT_UYVY8_2X8, |
| 30 | V4L2_MBUS_FMT_VYUY8_2X8, | 30 | V4L2_MBUS_FMT_VYUY8_2X8, |
| 31 | V4L2_MBUS_FMT_YVYU10_2X10, | ||
| 32 | V4L2_MBUS_FMT_YUYV10_2X10, | ||
| 33 | V4L2_MBUS_FMT_YVYU10_1X20, | ||
| 34 | V4L2_MBUS_FMT_YUYV10_1X20, | ||
| 35 | V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE, | ||
| 36 | V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE, | ||
| 31 | V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE, | 37 | V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE, |
| 32 | V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE, | 38 | V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE, |
| 33 | V4L2_MBUS_FMT_RGB565_2X8_LE, | 39 | V4L2_MBUS_FMT_RGB565_2X8_LE, |
| 34 | V4L2_MBUS_FMT_RGB565_2X8_BE, | 40 | V4L2_MBUS_FMT_RGB565_2X8_BE, |
| 41 | V4L2_MBUS_FMT_BGR565_2X8_LE, | ||
| 42 | V4L2_MBUS_FMT_BGR565_2X8_BE, | ||
| 35 | V4L2_MBUS_FMT_SBGGR8_1X8, | 43 | V4L2_MBUS_FMT_SBGGR8_1X8, |
| 36 | V4L2_MBUS_FMT_SBGGR10_1X10, | 44 | V4L2_MBUS_FMT_SBGGR10_1X10, |
| 37 | V4L2_MBUS_FMT_GREY8_1X8, | 45 | V4L2_MBUS_FMT_GREY8_1X8, |