github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-03 03:19:24 +01:00
Code Releases Activity

10l - some forgotten ifdefs

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10539 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
henry 2003-08-07 12:40:15 +00:00
parent 7e38b1aefb
commit d32a75c7c3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cfg-common.h
View File

@ -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},

4
libmpdemux/demuxer.c
View File

@ -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

2
libmpdemux/tvi_v4l2.c
View File

@ -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 */