From c106fe7751426c8c30706d2f131491dc8f37ee85 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 2 Mar 2010 19:57:17 +0000
Subject: Drop support for old-style DVB code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/vo_mpegpes.c | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'libvo/vo_mpegpes.c')

diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c
index f9f02c7654..211a17b8fd 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;
-- 
cgit v1.2.3