From 6a092e69a3ed6a583a1034d69818be14d2dc0a2c Mon Sep 17 00:00:00 2001 From: Javier Martin Date: Mon, 26 Mar 2012 09:17:46 -0300 Subject: [PATCH] --- yaml --- r: 306443 b: refs/heads/master c: 002eaf90a24451e423221d7a5826cdfdea1a0451 h: refs/heads/master i: 306441: 0bc50ef412cda6b7a610754a9f2263a7f2527c78 306439: 75de08f0f07af26d676c60d15af4fc4e4aaea5a3 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tvp5150.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b53b0b798bd0..de9924960912 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1eaef48b42aae965950c884e3f03143cb44da71b +refs/heads/master: 002eaf90a24451e423221d7a5826cdfdea1a0451 diff --git a/trunk/drivers/media/video/tvp5150.c b/trunk/drivers/media/video/tvp5150.c index 476a6a0bd108..b7867427e5c4 100644 --- a/trunk/drivers/media/video/tvp5150.c +++ b/trunk/drivers/media/video/tvp5150.c @@ -822,7 +822,7 @@ static int tvp5150_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index, if (index) return -EINVAL; - *code = V4L2_MBUS_FMT_YUYV8_2X8; + *code = V4L2_MBUS_FMT_UYVY8_2X8; return 0; } @@ -839,7 +839,7 @@ static int tvp5150_mbus_fmt(struct v4l2_subdev *sd, f->width = decoder->rect.width; f->height = decoder->rect.height; - f->code = V4L2_MBUS_FMT_YUYV8_2X8; + f->code = V4L2_MBUS_FMT_UYVY8_2X8; f->field = V4L2_FIELD_SEQ_TB; f->colorspace = V4L2_COLORSPACE_SMPTE170M;