summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-10-18 17:54:41 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-10-18 17:54:41 -0300
commit3861ba7353e0a787c17b86bf488880a234a1f817 (patch)
tree4e442479af034d15f55af7e553139721a0600d31 /linux/include
parentd968d366ae4f769786a3c4cbdc564f90c685beee (diff)
parentd1da42d9fbfabbd761ea109c6c52bb55504282b5 (diff)
downloadmediapointer-dvb-s2-3861ba7353e0a787c17b86bf488880a234a1f817.tar.gz
mediapointer-dvb-s2-3861ba7353e0a787c17b86bf488880a234a1f817.tar.bz2
merge: http://linuxtv.org/hg/~hhackmann/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.. */