summaryrefslogtreecommitdiff
path: root/drivers/media/video/mxc
diff options
context:
space:
mode:
authorLiu Ying <b17645@freescale.com>2010-01-08 16:02:40 -0500
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-24 11:50:03 +0200
commit00c4c112fbaf9a84a6441b02fee1ef2c723fbcc7 (patch)
tree42c94d9080dd8a27a91bca8cbdafe37619282181 /drivers/media/video/mxc
parentce7f969f417ac241a1cf2e5af1cce07f03acc2c7 (diff)
ENGR00119710 MXC V4L2 output:Support YUYV and UYVY input pixel format
Support YUYV and UYVY input pixel format for mxc V4L2 output. Signed-off-by: Liu Ying <b17645@freescale.com> Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/media/video/mxc')
-rw-r--r--drivers/media/video/mxc/output/mxc_v4l2_output.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/mxc/output/mxc_v4l2_output.c b/drivers/media/video/mxc/output/mxc_v4l2_output.c
index 5643aa3f8029..9e1ea12e3175 100644
--- a/drivers/media/video/mxc/output/mxc_v4l2_output.c
+++ b/drivers/media/video/mxc/output/mxc_v4l2_output.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2005-2010 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -224,6 +224,7 @@ static bool format_is_yuv(u32 pixelformat)
switch (pixelformat) {
case V4L2_PIX_FMT_YUV420:
case V4L2_PIX_FMT_UYVY:
+ case V4L2_PIX_FMT_YUYV:
case V4L2_PIX_FMT_YUV422P:
case V4L2_PIX_FMT_YVU420:
case V4L2_PIX_FMT_NV12:
@@ -1652,6 +1653,8 @@ static inline int valid_mode(u32 palette)
(palette == V4L2_PIX_FMT_BGR32) ||
(palette == V4L2_PIX_FMT_RGB32) ||
(palette == V4L2_PIX_FMT_NV12) ||
+ (palette == V4L2_PIX_FMT_UYVY) ||
+ (palette == V4L2_PIX_FMT_YUYV) ||
(palette == V4L2_PIX_FMT_YUV422P) ||
(palette == V4L2_PIX_FMT_YUV420));
}