[Mplayer-cvslog] CVS: main/libmpdemux demuxer.c,1.149,1.150 tvi_v4l2.c,1.1,1.2

[Jindrich Makovicka CVS]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv6219/libmpdemux

Modified Files:
	demuxer.c tvi_v4l2.c 
Log Message:
10l - some forgotten ifdefs

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- demuxer.c	19 Jul 2003 17:39:47 -0000	1.149
+++ demuxer.c	7 Aug 2003 12:40:14 -0000	1.150
@@ -146,7 +146,7 @@
 
 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 @@
       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

Index: tvi_v4l2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tvi_v4l2.c	7 Aug 2003 12:18:04 -0000	1.1
+++ tvi_v4l2.c	7 Aug 2003 12:40:15 -0000	1.2
@@ -1619,4 +1619,4 @@
     return(priv->audio_in.blocksize);
 }
 
-#endif /* USE_TV || HAVE_TV_V4L2 */
+#endif /* USE_TV && HAVE_TV_V4L2 */