From 88d3bc8b9eb45a8a45569c1f8a2e59450e2ac8de Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 16 Nov 2006 11:02:28 -0300 Subject: [PATCH] --- yaml --- r: 44063 b: refs/heads/master c: ed5801477addfbf5a40408866f5b2837e100451f h: refs/heads/master i: 44061: 53b501c8150d925522d876a1965331ea23bf7dd3 44059: 7360ea74cb70ebc50bc3aaad8eda77631a5e87f1 44055: 69a7b4e213844279b54138fa834f68ae2d2d7349 44047: 97bf1093c2ea0e1336eb354f7f4d1f7cba90fde7 44031: 1bdd551d76c2112ee6b8aadf47e6a2e24a2981fb v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-common.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e70baada9386..4b6c439518b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d9d171aaed2e0b1c5caac96efd4d4150eec97e1 +refs/heads/master: ed5801477addfbf5a40408866f5b2837e100451f diff --git a/trunk/drivers/media/video/v4l2-common.c b/trunk/drivers/media/video/v4l2-common.c index 78d28b03ec93..b0b4abe5c297 100644 --- a/trunk/drivers/media/video/v4l2-common.c +++ b/trunk/drivers/media/video/v4l2-common.c @@ -184,11 +184,13 @@ char *v4l2_field_names[] = { }; char *v4l2_type_names[] = { - [V4L2_BUF_TYPE_VIDEO_CAPTURE] = "video-cap", - [V4L2_BUF_TYPE_VIDEO_OVERLAY] = "video-over", - [V4L2_BUF_TYPE_VIDEO_OUTPUT] = "video-out", - [V4L2_BUF_TYPE_VBI_CAPTURE] = "vbi-cap", - [V4L2_BUF_TYPE_VBI_OUTPUT] = "vbi-out", + [V4L2_BUF_TYPE_VIDEO_CAPTURE] = "video-cap", + [V4L2_BUF_TYPE_VIDEO_OVERLAY] = "video-over", + [V4L2_BUF_TYPE_VIDEO_OUTPUT] = "video-out", + [V4L2_BUF_TYPE_VBI_CAPTURE] = "vbi-cap", + [V4L2_BUF_TYPE_VBI_OUTPUT] = "vbi-out", + [V4L2_BUF_TYPE_SLICED_VBI_CAPTURE] = "sliced-vbi-cap", + [V4L2_BUF_TYPE_SLICED_VBI_OUTPUT] = "slicec-vbi-out", }; static char *v4l2_memory_names[] = {