diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
| commit | b56858342fdbe48489618107df75e5bd0451eb0b (patch) | |
| tree | 5d41ef858502bae99dcbebdd728d42a6040adb03 /libvo/vo_mpegpes.c | |
| parent | 8ea7eb77fc7ba8bd0b596ea32ee60909a012828f (diff) | |
| parent | bae94777d7ddaa2d4763507fdb93b9520327c9d1 (diff) | |
| download | mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.bz2 mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.xz | |
Merge svn changes up to r27514
Diffstat (limited to 'libvo/vo_mpegpes.c')
| -rw-r--r-- | libvo/vo_mpegpes.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c index ec67bceee5..3971abdb69 100644 --- a/libvo/vo_mpegpes.c +++ b/libvo/vo_mpegpes.c @@ -24,9 +24,9 @@ #include "mp_msg.h" -#ifdef HAVE_DVB -#ifndef HAVE_DVB_HEAD -#include <sys/poll.h> +#ifdef CONFIG_DVB +#ifndef CONFIG_DVB_HEAD +#include <poll.h> #include <sys/ioctl.h> #include <stdio.h> @@ -41,7 +41,7 @@ #else #define true 1 #define false 0 -#include <sys/poll.h> +#include <poll.h> #include <sys/ioctl.h> #include <stdio.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(const unsigned char* data,int len){ int orig_len = len; -#ifdef HAVE_DVB +#ifdef CONFIG_DVB #define NFD 2 struct pollfd pfd[NFD]; |