diff options
| -rw-r--r-- | cfg-common.h | 2 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 4 | ||||
| -rw-r--r-- | libmpdemux/tvi_v4l2.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cfg-common.h b/cfg-common.h index 40adb9c4b6..187c1bb4fa 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -304,7 +304,7 @@ struct config tvopts_conf[]={ {"contrast", &tv_param_contrast, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL}, {"hue", &tv_param_hue, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL}, {"saturation", &tv_param_saturation, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL}, -#ifdef HAVE_TV_V4L +#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2) {"amode", &tv_param_amode, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, {"volume", &tv_param_volume, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL}, {"bass", &tv_param_bass, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL}, diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 23ca3ce2d4..0000b0f7c5 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -146,7 +146,7 @@ extern int tv_param_on; extern int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds); extern int demux_open_tv(demuxer_t *demuxer); -#if defined(USE_TV) && defined(HAVE_TV_V4L) +#if defined(USE_TV) && (defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)) extern void demux_close_tv(demuxer_t *demuxer); #endif #endif @@ -177,7 +177,7 @@ void free_demuxer(demuxer_t *demuxer){ demux_close_nuv(demuxer); break; case DEMUXER_TYPE_MPEG_TY: demux_close_ty(demuxer); break; -#if defined(USE_TV) && defined(HAVE_TV_V4L) +#if defined(USE_TV) && (defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)) case DEMUXER_TYPE_TV: demux_close_tv(demuxer); break; #endif diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c index f537195544..dc09b5160d 100644 --- a/libmpdemux/tvi_v4l2.c +++ b/libmpdemux/tvi_v4l2.c @@ -1619,4 +1619,4 @@ static int get_audio_framesize(priv_t *priv) return(priv->audio_in.blocksize); } -#endif /* USE_TV || HAVE_TV_V4L2 */ +#endif /* USE_TV && HAVE_TV_V4L2 */ |