summaryrefslogtreecommitdiff
path: root/v4l2-apps/util/ivtv-ctl.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 18:35:43 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 18:35:43 -0300
commite8beadde87198bcede646d9a96042f017d115d7b (patch)
tree49621d71d57cff7daacae777f234f62e00f6dd5a /v4l2-apps/util/ivtv-ctl.c
parentb411ce2ea34831c61d02f0ce0278f525abd2e3c3 (diff)
parentfcf7b1133c054c011cd1cb75ac466333f61812f8 (diff)
downloadmediapointer-dvb-s2-e8beadde87198bcede646d9a96042f017d115d7b.tar.gz
mediapointer-dvb-s2-e8beadde87198bcede646d9a96042f017d115d7b.tar.bz2
merge? http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-empress
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");