[MPlayer-cvslog] r27401 - in trunk: configure libao2/ao_mpegpes.c libvo/vo_mpegpes.c

[diego]

Author: diego
Date: Sat Aug  2 23:39:29 2008
New Revision: 27401

Log:
Set HAVE_DVB in configure when HAVE_DVB_HEAD is defined
instead of doing in redundantly in DVB-specific files.


Modified:
   trunk/configure
   trunk/libao2/ao_mpegpes.c
   trunk/libvo/vo_mpegpes.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sat Aug  2 23:39:29 2008
@@ -4566,7 +4566,8 @@ EOF
 fi
 echores "$_dvbhead"
 if test "$_dvbhead" = yes ; then
-  _def_dvb='#define HAVE_DVB_HEAD 1'
+  _def_dvb='#define HAVE_DVB 1'
+  _def_dvb_head='#define HAVE_DVB_HEAD 1'
   _def_dvb_in='#define HAS_DVBIN_SUPPORT 1'
   _aomodules="mpegpes(dvb) $_aomodules"
   _vomodules="mpegpes(dvb) $_vomodules"
@@ -4574,6 +4575,7 @@ fi
 
 if test "$_dvbhead" = no && test "$_dvb" = no ; then
   _def_dvb='#undef HAVE_DVB'
+  _def_dvb_head='#undef HAVE_DVB_HEAD'
   _def_dvb_in='#undef HAS_DVBIN_SUPPORT '
   _aomodules="mpegpes(file) $_aomodules"
   _vomodules="mpegpes(file) $_vomodules"
@@ -8673,6 +8675,7 @@ $_def_dxr3
 $_def_ivtv
 $_def_v4l2
 $_def_dvb
+$_def_dvb_head
 $_def_dvb_in
 $_def_svga
 $_def_vesa

Modified: trunk/libao2/ao_mpegpes.c
==============================================================================
--- trunk/libao2/ao_mpegpes.c	(original)
+++ trunk/libao2/ao_mpegpes.c	Sat Aug  2 23:39:29 2008
@@ -10,10 +10,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_DVB_HEAD
-#define HAVE_DVB 1
-#endif
-
 #ifdef HAVE_DVB
 #include <sys/poll.h>
 #include <sys/ioctl.h>

Modified: trunk/libvo/vo_mpegpes.c
==============================================================================
--- trunk/libvo/vo_mpegpes.c	(original)
+++ trunk/libvo/vo_mpegpes.c	Sat Aug  2 23:39:29 2008
@@ -23,9 +23,7 @@
 #include <unistd.h>
 
 #include "mp_msg.h"
-#ifdef HAVE_DVB_HEAD
-#define HAVE_DVB 1
-#endif
+
 #ifdef HAVE_DVB
 #ifndef HAVE_DVB_HEAD
 #include <sys/poll.h>