summaryrefslogtreecommitdiff
path: root/v4l2-apps/util/ivtv-ctl.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 18:40:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 18:40:09 -0300
commit3308516a2fe5ca58a64f65fe813de98f3637d653 (patch)
tree0974c897287c884849110e16586c0f34d8f47957 /v4l2-apps/util/ivtv-ctl.c
parenta9bf92eb33a4ad79b8093c90379fb9d7519f1c88 (diff)
parente17ae483fc1526567d78cf551747362614aaae95 (diff)
downloadmediapointer-dvb-s2-3308516a2fe5ca58a64f65fe813de98f3637d653.tar.gz
mediapointer-dvb-s2-3308516a2fe5ca58a64f65fe813de98f3637d653.tar.bz2
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> 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");