RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-21 02:41:13 +00:00
Code Issues Releases Wiki Activity

Set HAVE_DVB in configure when HAVE_DVB_HEAD is defined

Browse Source 
instead of doing in redundantly in DVB-specific files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27401 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-08-02 21:39:29 +00:00
parent 429bf7a9dc
commit 52d358e3dc
3 changed files with 5 additions and 8 deletions

5
configure vendored
View File

@ -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

4
libao2/ao_mpegpes.c
View File

@ -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>

4
libvo/vo_mpegpes.c
View File

@ -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>