From 832d9410e53b26d8af3ff1b27e4f24fe3d1cc279 Mon Sep 17 00:00:00 2001 From: Ian Armstrong Date: Mon, 5 Nov 2007 14:30:03 -0300 Subject: [PATCH] --- yaml --- r: 76519 b: refs/heads/master c: 368f080b6870e65d43c346e085e8f81ade5d3e07 h: refs/heads/master i: 76517: c1f6f5745d3e1940ac78ec04f81fd4ed226f33c1 76515: 5651dcd0afdae9a64866d97e31d7d3a47c6ab8ad 76511: 6d2d451ec625d47b18344eb3f0e4171b528e5869 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c4b6d0a23a4a..25988936f0fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77aded6ba51f01335840ce8e18b413067810b68e +refs/heads/master: 368f080b6870e65d43c346e085e8f81ade5d3e07 diff --git a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c index 57eb8dfe53fa..0618fee24952 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c @@ -894,7 +894,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void case VIDIOC_ENUM_FMT: { static struct v4l2_fmtdesc formats[] = { { 0, 0, 0, - "HM12 (YUV 4:2:2)", V4L2_PIX_FMT_HM12, + "HM12 (YUV 4:2:0)", V4L2_PIX_FMT_HM12, { 0, 0, 0, 0 } }, { 1, 0, V4L2_FMT_FLAG_COMPRESSED,