diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 03:00:14 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 03:00:14 +0200 |
| commit | 240550bbb94653907faa6e0bb1c5ac3d279cc252 (patch) | |
| tree | 1cd5346e52515dbeff187d040d79b92fae96caa9 /libvo/vo_mpegpes.c | |
| parent | 9895f2360fd5e8c48f21117d6934254317891cde (diff) | |
| parent | fbb74e16a38d6a5af31a7fb369195988f7414766 (diff) | |
| download | mpv-240550bbb94653907faa6e0bb1c5ac3d279cc252.tar.bz2 mpv-240550bbb94653907faa6e0bb1c5ac3d279cc252.tar.xz | |
Merge svn changes up to r30848
Diffstat (limited to 'libvo/vo_mpegpes.c')
| -rw-r--r-- | libvo/vo_mpegpes.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c index b96b0af639..f7b2a5b0b7 100644 --- a/libvo/vo_mpegpes.c +++ b/libvo/vo_mpegpes.c @@ -38,20 +38,6 @@ #include "mp_msg.h" #ifdef CONFIG_DVB -#ifndef CONFIG_DVB_HEAD -#include <poll.h> - -#include <sys/ioctl.h> -#include <stdio.h> -#include <time.h> - -#include <ost/dmx.h> -#include <ost/frontend.h> -#include <ost/sec.h> -#include <ost/video.h> -#include <ost/audio.h> - -#else #define true 1 #define false 0 #include <poll.h> @@ -65,7 +51,6 @@ #include <linux/dvb/video.h> #include <linux/dvb/audio.h> #endif -#endif #include "config.h" #include "video_out.h" @@ -141,15 +126,9 @@ 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 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"); -#else mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/dvb/adapter%d/video0+audio0\n", card); sprintf(vo_file, "/dev/dvb/adapter%d/video0", card); sprintf(ao_file, "/dev/dvb/adapter%d/audio0", card); -#endif if((vo_mpegpes_fd = open(vo_file,O_RDWR)) < 0){ perror("DVB VIDEO DEVICE: "); return -1; |