diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-27 09:30:39 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-27 09:30:39 +0000 |
| commit | a881f35f1a556609ec7cc21671777d3a2e5c4444 (patch) | |
| tree | 634b623e25e33f28202184124b81c03d663deda0 /libmpdemux | |
| parent | 3e2db07a32eebf6159bd40f661ed98365e9a3516 (diff) | |
| download | mpv-a881f35f1a556609ec7cc21671777d3a2e5c4444.tar.bz2 mpv-a881f35f1a556609ec7cc21671777d3a2e5c4444.tar.xz | |
Rename *v4l variable to *v4l1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19192 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/Makefile | 2 | ||||
| -rw-r--r-- | libmpdemux/tv.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 10446017d9..ffd55a1405 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -79,7 +79,7 @@ SRCS += tv.c frequencies.c tvi_dummy.c SRCS += stream_pvr.c endif endif - ifeq ($(TV_V4L),yes) + ifeq ($(TV_V4L1),yes) SRCS += tvi_v4l.c audio_in.c endif ifneq ($(TV_V4L)$(TV_V4L2),) diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c index d87dc78d5a..1fa0b02f17 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_V4L) || defined(HAVE_TV_V4L2) +#if defined(HAVE_TV_V4L1) || defined(HAVE_TV_V4L2) int tv_param_amode = -1; int tv_param_volume = -1; int tv_param_bass = -1; @@ -237,7 +237,7 @@ static int open_tv(tvi_handle_t *tvh) } #endif -#ifdef HAVE_TV_V4L +#ifdef HAVE_TV_V4L1 if ( tv_param_mjpeg ) { /* set width to expected value */ @@ -638,7 +638,7 @@ tvi_handle_t *tv_begin(void) { if (!strcmp(tv_param_driver, "dummy")) return tvi_init_dummy(tv_param_device); -#ifdef HAVE_TV_V4L +#ifdef HAVE_TV_V4L1 if (!strcmp(tv_param_driver, "v4l")) return tvi_init_v4l(tv_param_device, tv_param_adevice); #endif |