1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/mplayer-0.90rc1-head.diff	Sat Dec 29 14:47:40 2007 +0100
     1.3 @@ -0,0 +1,51 @@
     1.4 +diff -ruN ./libao2/ao_mpegpes.c /usr/src/MPlayer-0.90rc1/libao2/ao_mpegpes.c
     1.5 +--- ./libao2/ao_mpegpes.c	Sun Oct  6 03:08:04 2002
     1.6 ++++ /usr/src/MPlayer-0.90rc1/libao2/ao_mpegpes.c	Wed Dec 11 15:47:20 2002
     1.7 +@@ -15,7 +15,7 @@
     1.8 + #include "../mp_msg.h"
     1.9 + 
    1.10 + #ifdef HAVE_DVB
    1.11 +-#include <ost/audio.h>
    1.12 +-audioMixer_t dvb_mixer={255,255};
    1.13 ++#include <linux/dvb/audio.h>
    1.14 ++audio_mixer_t dvb_mixer={255,255};
    1.15 + #endif
    1.16 + extern int vo_mpegpes_fd;
    1.17 +diff -ruN ./libvo/vo_mpegpes.c /usr/src/MPlayer-0.90rc1/libvo/vo_mpegpes.c
    1.18 +--- ./libvo/vo_mpegpes.c	Mon Nov 11 16:20:26 2002
    1.19 ++++ /usr/src/MPlayer-0.90rc1/libvo/vo_mpegpes.c	Wed Dec 11 15:54:49 2002
    1.20 +@@ -35,12 +35,14 @@
    1.21 + #include <stdio.h>
    1.22 + #include <time.h>
    1.23 + 
    1.24 +-#include <ost/dmx.h>
    1.25 +-#include <ost/frontend.h>
    1.26 +-#include <ost/sec.h>
    1.27 +-#include <ost/video.h>
    1.28 +-#include <ost/audio.h>
    1.29 +-
    1.30 ++#include <linux/dvb/video.h>
    1.31 ++#include <linux/dvb/audio.h>
    1.32 ++#ifndef true
    1.33 ++#define true 1
    1.34 ++#endif
    1.35 ++#ifndef false
    1.36 ++#define false 0
    1.37 ++#endif
    1.38 + #endif
    1.39 + 
    1.40 + #include "config.h"
    1.41 +@@ -86,11 +88,11 @@
    1.42 + #ifdef HAVE_DVB
    1.43 +     if(!arg){
    1.44 +     //|O_NONBLOCK
    1.45 +-	if((vo_mpegpes_fd = open("/dev/ost/video",O_RDWR)) < 0){
    1.46 ++	if((vo_mpegpes_fd = open("/dev/dvb/adapter0/video0",O_RDWR)) < 0){
    1.47 + 		perror("DVB VIDEO DEVICE: ");
    1.48 + 		return -1;
    1.49 + 	}
    1.50 +-	if((vo_mpegpes_fd2 = open("/dev/ost/audio",O_RDWR|O_NONBLOCK)) < 0){
    1.51 ++	if((vo_mpegpes_fd2 = open("/dev/dvb/adapter0/audio0",O_RDWR|O_NONBLOCK)) < 0){
    1.52 + 		perror("DVB AUDIO DEVICE: ");
    1.53 + 		return -1;
    1.54 + 	}