summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-10-13 08:00:31 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-10-13 08:00:31 -0300
commitb8ebfdd7de56e85303b60ab999b39806006fc46c (patch)
treeaa1f4eb09a9f351f989d0fa5d5dd61a0a718fc34 /linux/include
parentef7138e66f9b6543dc62506c657ed01618ce8237 (diff)
parent477883c9a396fef3696c00a138f20d50629aae62 (diff)
downloadmediapointer-dvb-s2-b8ebfdd7de56e85303b60ab999b39806006fc46c.tar.gz
mediapointer-dvb-s2-b8ebfdd7de56e85303b60ab999b39806006fc46c.tar.bz2
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/linux/videodev2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h
index f886a85ac..bd484d60a 100644
--- a/linux/include/linux/videodev2.h
+++ b/linux/include/linux/videodev2.h
@@ -243,7 +243,7 @@ struct v4l2_pix_format
#define V4L2_PIX_FMT_YUV420 v4l2_fourcc('Y','U','1','2') /* 12 YUV 4:2:0 */
#define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y','Y','U','V') /* 16 YUV 4:2:2 */
#define V4L2_PIX_FMT_HI240 v4l2_fourcc('H','I','2','4') /* 8 8-bit color */
-#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H','M','1','2') /* 8 YUV 4:1:1 16x16 macroblocks */
+#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H','M','1','2') /* 8 YUV 4:2:0 16x16 macroblocks */
/* see http://www.siliconimaging.com/RGB%20Bayer.htm */
#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */