From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Mon, 23 Jul 2012 09:58:45 +0000 (+0200)
Subject: qv4l2: fix input/std combobox handling for vbi devices.
X-Git-Tag: v4l-utils-0.9.1~100
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e4c16820cf3a793753323197bb8de464e6c2878;p=platform%2Fupstream%2Fv4l-utils.git

qv4l2: fix input/std combobox handling for vbi devices.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---

diff --git a/utils/qv4l2/general-tab.cpp b/utils/qv4l2/general-tab.cpp
index 905a9c8..2693106 100644
--- a/utils/qv4l2/general-tab.cpp
+++ b/utils/qv4l2/general-tab.cpp
@@ -290,6 +290,7 @@ GeneralTab::GeneralTab(const QString &device, v4l2 &fd, int n, QWidget *parent)
 			m_vbiMethods->addItem("Sliced");
 		addWidget(m_vbiMethods);
 		connect(m_vbiMethods, SIGNAL(activated(int)), SLOT(vbiMethodsChanged(int)));
+		updateVideoInput();
 		goto capture_method;
 	}
 
@@ -331,7 +332,6 @@ GeneralTab::GeneralTab(const QString &device, v4l2 &fd, int n, QWidget *parent)
 	connect(m_frameInterval, SIGNAL(activated(int)), SLOT(frameIntervalChanged(int)));
 
 	updateVideoInput();
-
 	updateVidCapFormat();
 
 	if (caps() & V4L2_CAP_VIDEO_OUTPUT) {
@@ -875,6 +875,8 @@ void GeneralTab::updateVidCapFormat()
 	v4l2_fmtdesc desc;
 	v4l2_format fmt;
 
+	if (isVbi())
+		return;
 	g_fmt_cap(fmt);
 	m_pixelformat = fmt.fmt.pix.pixelformat;
 	m_width       = fmt.fmt.pix.width;