[Mplayer-cvslog] CVS: main/libvo Makefile,1.20,1.21 vo_mpegpes.c,1.11,1.12

[Johannes Feigl]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv31400

Modified Files:
	Makefile vo_mpegpes.c 
Log Message:
autodetecting for dvb-cards

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile	31 Oct 2001 22:04:28 -0000	1.20
+++ Makefile	5 Nov 2001 21:49:20 -0000	1.21
@@ -13,7 +13,7 @@
 endif
 endif
 
-CFLAGS  = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(MLIB_INC) -DMPG12PLAY #-Wall
+CFLAGS  = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(MLIB_INC) $(DVB_INC) -DMPG12PLAY #-Wall
 # -I/usr/X11R6/include/
 
 .SUFFIXES: .c .o

Index: vo_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mpegpes.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vo_mpegpes.c	5 Nov 2001 05:38:23 -0000	1.11
+++ vo_mpegpes.c	5 Nov 2001 21:49:20 -0000	1.12
@@ -1,4 +1,3 @@
-#undef HAVE_DVB
 #define PES_MAX_SIZE 2048
 /* 
  * Based on:
@@ -21,6 +20,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+
+#include "config.h"
 
 #ifdef HAVE_DVB