diff options
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_bl.c | 9 | ||||
| -rw-r--r-- | libvo/vo_fbdev.c | 2 | ||||
| -rw-r--r-- | libvo/vo_mpegpes.c | 18 |
3 files changed, 13 insertions, 16 deletions
diff --git a/libvo/vo_bl.c b/libvo/vo_bl.c index 1aaa5c888a..fa3f36d2e3 100644 --- a/libvo/vo_bl.c +++ b/libvo/vo_bl.c @@ -34,14 +34,9 @@ #include "config.h" -#ifndef HAVE_WINSOCK2 -#define closesocket close #include <netdb.h> #include <sys/socket.h> #include <netinet/in.h> -#else -#include <winsock2.h> -#endif #include "video_out.h" #include "video_out_internal.h" @@ -187,7 +182,7 @@ static int udp_init(bl_host_t *h) { if (connect(h->fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { mp_msg(MSGT_VO, MSGL_ERR, "couldn't connect socket for %s\n", h->name); - closesocket(h->fd); + close(h->fd); return 1; } return 0; @@ -199,7 +194,7 @@ static void udp_send(bl_host_t *h) { } static void udp_close(bl_host_t *h) { - closesocket(h->fd); + close(h->fd); } #define NO_BLS 3 diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index abe5d9aeeb..e8f5e86ba7 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -25,6 +25,7 @@ #include "video_out_internal.h" #include "fastmemcpy.h" #include "sub.h" +#include "geometry.h" #ifdef CONFIG_VIDIX #include "vosub_vidix.h" #endif @@ -999,6 +1000,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, #endif { int x_offset=0,y_offset=0; + geometry(&x_offset, &y_offset, &out_width, &out_height, fb_xres, fb_yres); if ((frame_buffer = (uint8_t *) mmap(0, fb_size, PROT_READ | PROT_WRITE, MAP_SHARED, fb_dev_fd, 0)) == (uint8_t *) -1) { mp_msg(MSGT_VO, MSGL_ERR, "Can't mmap %s: %s\n", fb_dev_name, strerror(errno)); 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]; |