summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/Makefile2
-rw-r--r--libmpdemux/tv.c2
-rw-r--r--libmpdemux/tv.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index ffd55a1405..fb8870d537 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -82,7 +82,7 @@ SRCS += tv.c frequencies.c tvi_dummy.c
ifeq ($(TV_V4L1),yes)
SRCS += tvi_v4l.c audio_in.c
endif
- ifneq ($(TV_V4L)$(TV_V4L2),)
+ ifeq ($(TV_V4L),yes)
ifeq ($(ALSA1X),yes)
SRCS += ai_alsa1x.c
endif
diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c
index 1fa0b02f17..74ac7e39fc 100644
--- a/libmpdemux/tv.c
+++ b/libmpdemux/tv.c
@@ -56,7 +56,7 @@ int tv_param_outfmt = -1;
float tv_param_fps = -1.0;
char **tv_param_channels = NULL;
int tv_param_audio_id = 0;
-#if defined(HAVE_TV_V4L1) || defined(HAVE_TV_V4L2)
+#if defined(HAVE_TV_V4L)
int tv_param_amode = -1;
int tv_param_volume = -1;
int tv_param_bass = -1;
diff --git a/libmpdemux/tv.h b/libmpdemux/tv.h
index 31f7821dbd..6a4f03b98d 100644
--- a/libmpdemux/tv.h
+++ b/libmpdemux/tv.h
@@ -28,7 +28,7 @@ extern int tv_param_noaudio;
extern int tv_param_immediate;
extern int tv_param_audiorate;
extern int tv_param_audio_id;
-#if defined(HAVE_TV_V4L1) || defined(HAVE_TV_V4L2)
+#if defined(HAVE_TV_V4L)
extern int tv_param_amode;
extern int tv_param_volume;
extern int tv_param_bass;