summaryrefslogtreecommitdiff
path: root/v4l2-apps/util/ivtv-ctl.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 15:04:50 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 15:04:50 -0300
commit6f9aa9413aac5a24f2e03dc48b2ff3db0ccafc92 (patch)
tree02172a25eeee331f91f11fc91a8e855ada74ade9 /v4l2-apps/util/ivtv-ctl.c
parent59a57f6b9ea53f0ff73ec4eafbab23f2dea7221e (diff)
parent42b611c065802d5d31f3fd7629bc10e2b134c661 (diff)
downloadmediapointer-dvb-s2-6f9aa9413aac5a24f2e03dc48b2ff3db0ccafc92.tar.gz
mediapointer-dvb-s2-6f9aa9413aac5a24f2e03dc48b2ff3db0ccafc92.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-dev
From: Mauro Carvalho Chehab <mchehab@infradead.org> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/util/ivtv-ctl.c')
-rw-r--r--v4l2-apps/util/ivtv-ctl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/v4l2-apps/util/ivtv-ctl.c b/v4l2-apps/util/ivtv-ctl.c
index ab836e240..af84164e3 100644
--- a/v4l2-apps/util/ivtv-ctl.c
+++ b/v4l2-apps/util/ivtv-ctl.c
@@ -351,9 +351,9 @@ int main(int argc, char **argv)
unsigned short gpio_dir = 0x0; /* GPIO direction bits */
int gpio_set_dir = 0;
int passthrough = 0;
- int audio_mute = 0;
- int stereo_mode = 0;
- int bilingual_mode = 0;
+ long audio_mute = 0;
+ long stereo_mode = 0;
+ long bilingual_mode = 0;
int debug_level = 0;
__u32 reset = 0;
int new_debug_level, gdebug_level;
@@ -621,7 +621,7 @@ int main(int argc, char **argv)
}
if (options[OptPassThrough]) {
- int source = passthrough ? VIDEO_SOURCE_DEMUX : VIDEO_SOURCE_MEMORY;
+ long source = passthrough ? VIDEO_SOURCE_DEMUX : VIDEO_SOURCE_MEMORY;
doioctl(fd, VIDEO_SELECT_SOURCE, (void *)source,
"IVTV_IOC_PASSTHROUGH");