diff options
| -rw-r--r-- | libao2/ao_mpegpes.c | 18 | ||||
| -rw-r--r-- | libvo/vo_mpegpes.c | 14 |
2 files changed, 16 insertions, 16 deletions
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index b1fb17ffde..ccb9d04553 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -10,7 +10,7 @@ #include "config.h" -#ifdef HAVE_DVB +#ifdef CONFIG_DVB #include <sys/poll.h> #include <sys/ioctl.h> #endif @@ -25,8 +25,8 @@ #include "mp_msg.h" #include "help_mp.h" -#ifdef HAVE_DVB -#ifndef HAVE_DVB_HEAD +#ifdef CONFIG_DVB +#ifndef CONFIG_DVB_HEAD #include <ost/audio.h> audioMixer_t dvb_mixer={255,255}; #else @@ -45,7 +45,7 @@ int vo_mpegpes_fd2 = -1; static ao_info_t info = { -#ifdef HAVE_DVB +#ifdef CONFIG_DVB "DVB audio output", #else "MPEG-PES audio output", @@ -60,7 +60,7 @@ LIBAO_EXTERN(mpegpes) // to set/get/query special features/parameters static int control(int cmd,void *arg){ -#ifdef HAVE_DVB +#ifdef CONFIG_DVB switch(cmd){ case AOCONTROL_GET_VOLUME: if(vo_mpegpes_fd2>=0){ @@ -92,11 +92,11 @@ static int control(int cmd,void *arg){ static int freq=0; static int freq_id=0; -#ifdef HAVE_DVB +#ifdef CONFIG_DVB static int init_device(int card) { char ao_file[30]; -#ifndef HAVE_DVB_HEAD +#ifndef CONFIG_DVB_HEAD mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/ost/audio\n"); sprintf(ao_file, "/dev/ost/audio"); #else @@ -171,7 +171,7 @@ static int preinit(const char *arg) } card--; -#ifdef HAVE_DVB +#ifdef CONFIG_DVB if(!ao_file) return init_device(card); #else @@ -190,7 +190,7 @@ static int preinit(const char *arg) static int my_ao_write(unsigned char* data,int len){ int orig_len = len; -#ifdef HAVE_DVB +#ifdef CONFIG_DVB #define NFD 1 struct pollfd pfd[NFD]; diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c index 5636ee13dd..902be94f27 100644 --- a/libvo/vo_mpegpes.c +++ b/libvo/vo_mpegpes.c @@ -24,8 +24,8 @@ #include "mp_msg.h" -#ifdef HAVE_DVB -#ifndef HAVE_DVB_HEAD +#ifdef CONFIG_DVB +#ifndef CONFIG_DVB_HEAD #include <sys/poll.h> #include <sys/ioctl.h> @@ -64,7 +64,7 @@ extern int vo_mpegpes_fd2; static const vo_info_t info = { -#ifdef HAVE_DVB +#ifdef CONFIG_DVB "MPEG-PES to DVB card", #else "MPEG-PES file", @@ -79,7 +79,7 @@ const LIBVO_EXTERN (mpegpes) static int config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format) { -#ifdef HAVE_DVB +#ifdef CONFIG_DVB switch(s_height){ case 288: case 576: @@ -95,7 +95,7 @@ config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uin } static int preinit(const char *arg){ -#ifdef HAVE_DVB +#ifdef CONFIG_DVB int card = -1; char vo_file[30], ao_file[30], *tmp; @@ -128,7 +128,7 @@ static int preinit(const char *arg){ mp_msg(MSGT_VO,MSGL_INFO, "Couldn't find a usable dvb video device, exiting\n"); return -1; } -#ifndef HAVE_DVB_HEAD +#ifndef CONFIG_DVB_HEAD mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/ost/video+audio\n"); sprintf(vo_file, "/dev/ost/video"); sprintf(ao_file, "/dev/ost/audio"); @@ -174,7 +174,7 @@ static void draw_osd(void) static int my_write(unsigned char* data,int len){ int orig_len = len; -#ifdef HAVE_DVB +#ifdef CONFIG_DVB #define NFD 2 struct pollfd pfd[NFD]; |