From 873e138b8487404e348e68c303fa7e98eb2a27d0 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Mon, 26 Nov 2012 14:32:48 -0300
Subject: [PATCH] --- yaml --- r: 356971 b: refs/heads/master c:
 bc1ebd704751bb6b86612e63fdfac56918364d07 h: refs/heads/master i:   356969:
 1d920cb52e2f5776ab4f00061ad9681979f650fd   356967:
 4e2354024f0e21351de28f7b2fdcaa2094c8d10b v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/media/platform/sh_vou.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ad528a6f9baa..cf897300bc7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 605a410325535e0d9dd3c539ac144fc52e0bda21
+refs/heads/master: bc1ebd704751bb6b86612e63fdfac56918364d07
diff --git a/trunk/drivers/media/platform/sh_vou.c b/trunk/drivers/media/platform/sh_vou.c
index a1c87f0ceaab..7494858a2158 100644
--- a/trunk/drivers/media/platform/sh_vou.c
+++ b/trunk/drivers/media/platform/sh_vou.c
@@ -207,6 +207,7 @@ static void sh_vou_stream_start(struct sh_vou_device *vou_dev,
 #endif
 
 	switch (vou_dev->pix.pixelformat) {
+	default:
 	case V4L2_PIX_FMT_NV12:
 	case V4L2_PIX_FMT_NV16:
 		row_coeff = 1;
@@ -595,9 +596,9 @@ static void vou_adjust_input(struct sh_vou_geometry *geo, v4l2_std_id std)
  */
 static void vou_adjust_output(struct sh_vou_geometry *geo, v4l2_std_id std)
 {
-	unsigned int best_err = UINT_MAX, best, width_max, height_max,
-		img_height_max;
-	int i, idx;
+	unsigned int best_err = UINT_MAX, best = geo->in_width,
+		width_max, height_max, img_height_max;
+	int i, idx = 0;
 
 	if (std & V4L2_STD_525_60) {
 		width_max = 858;