diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-02 21:39:29 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-02 21:39:29 +0000 |
| commit | 52d358e3dcd4bc813441f6e23d8d9d212a18d7dd (patch) | |
| tree | 43f749fb2edd128cb8ebc036d63576c4d275f2aa | |
| parent | 429bf7a9dc44a00460a4c8e183052f237f7bc4df (diff) | |
| download | mpv-52d358e3dcd4bc813441f6e23d8d9d212a18d7dd.tar.bz2 mpv-52d358e3dcd4bc813441f6e23d8d9d212a18d7dd.tar.xz | |
Set HAVE_DVB in configure when HAVE_DVB_HEAD is defined
instead of doing in redundantly in DVB-specific files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27401 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libao2/ao_mpegpes.c | 4 | ||||
| -rw-r--r-- | libvo/vo_mpegpes.c | 4 |
3 files changed, 5 insertions, 8 deletions
@@ -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 diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index a1dee788c5..b1fb17ffde 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -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> diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c index c659b98c8f..5636ee13dd 100644 --- a/libvo/vo_mpegpes.c +++ b/libvo/vo_mpegpes.c @@ -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> |