diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-11-28 08:03:23 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-11-28 08:03:23 -0200 |
commit | 05222402b72fa35a14adb35db4e51e55d3b72f2f (patch) | |
tree | ce5a78e12fb23de330787a3d4d440433af1f6f78 /v4l2-apps/util/qv4l2 | |
parent | 87fc384f35e1ee563498df696b57b908a215a499 (diff) | |
parent | 080a587ad1c509488047ab48c14f424b3e3c2cd9 (diff) | |
download | mediapointer-dvb-s2-05222402b72fa35a14adb35db4e51e55d3b72f2f.tar.gz mediapointer-dvb-s2-05222402b72fa35a14adb35db4e51e55d3b72f2f.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/lgdt330x
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/util/qv4l2')
-rw-r--r-- | v4l2-apps/util/qv4l2/general-tab.cpp | 2 | ||||
-rw-r--r-- | v4l2-apps/util/qv4l2/general-tab.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/v4l2-apps/util/qv4l2/general-tab.cpp b/v4l2-apps/util/qv4l2/general-tab.cpp index a19cf911b..87a0f520d 100644 --- a/v4l2-apps/util/qv4l2/general-tab.cpp +++ b/v4l2-apps/util/qv4l2/general-tab.cpp @@ -295,7 +295,7 @@ void GeneralTab::updateStandard() tvStandard->setCurrentItem(vs.index); what.sprintf("TV Standard (0x%llX)\n" "Frame period: %f (%d/%d)\n" - "Frame lines: %d\n", std, + "Frame lines: %d\n", (long long int)std, (double)vs.frameperiod.numerator / vs.frameperiod.denominator, vs.frameperiod.numerator, vs.frameperiod.denominator, vs.framelines); diff --git a/v4l2-apps/util/qv4l2/general-tab.h b/v4l2-apps/util/qv4l2/general-tab.h index 44003fd40..110632014 100644 --- a/v4l2-apps/util/qv4l2/general-tab.h +++ b/v4l2-apps/util/qv4l2/general-tab.h @@ -21,6 +21,7 @@ #ifndef GENERAL_TAB_H #define GENERAL_TAB_H +#include <sys/time.h> #include <linux/videodev2.h> #include <qgrid.h> |