From 00eb54584d6427c86f9588288cbb0c8c0c9c1394 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 22 Nov 2011 08:48:47 -0300 Subject: [PATCH] --- yaml --- r: 286385 b: refs/heads/master c: 20c9fe895a2356924a31a1238f75cf0d05704593 h: refs/heads/master i: 286383: fbbe0c9c73ca3ba989f2e6c7ba289b41b48a7e44 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/zoran/zoran_driver.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 27ba6d40a6d6..e1d4f6e46439 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05834fcf58fe77b0519a8dc40e3c4a5a28dfc88d +refs/heads/master: 20c9fe895a2356924a31a1238f75cf0d05704593 diff --git a/trunk/drivers/media/video/zoran/zoran_driver.c b/trunk/drivers/media/video/zoran/zoran_driver.c index d4d05d2ace65..f7d236a2402a 100644 --- a/trunk/drivers/media/video/zoran/zoran_driver.c +++ b/trunk/drivers/media/video/zoran/zoran_driver.c @@ -1958,7 +1958,6 @@ static int zoran_g_fbuf(struct file *file, void *__fh, mutex_unlock(&zr->resource_lock); fb->fmt.colorspace = V4L2_COLORSPACE_SRGB; fb->fmt.field = V4L2_FIELD_INTERLACED; - fb->flags = V4L2_FBUF_FLAG_OVERLAY; fb->capability = V4L2_FBUF_CAP_LIST_CLIPPING; return 0;