|
nathan@0
|
1 |
diff -ruN ./libao2/ao_mpegpes.c /usr/src/MPlayer-0.90rc1/libao2/ao_mpegpes.c
|
|
nathan@0
|
2 |
--- ./libao2/ao_mpegpes.c Sun Oct 6 03:08:04 2002
|
|
nathan@0
|
3 |
+++ /usr/src/MPlayer-0.90rc1/libao2/ao_mpegpes.c Wed Dec 11 15:47:20 2002
|
|
nathan@0
|
4 |
@@ -15,7 +15,7 @@
|
|
nathan@0
|
5 |
#include "../mp_msg.h"
|
|
nathan@0
|
6 |
|
|
nathan@0
|
7 |
#ifdef HAVE_DVB
|
|
nathan@0
|
8 |
-#include <ost/audio.h>
|
|
nathan@0
|
9 |
-audioMixer_t dvb_mixer={255,255};
|
|
nathan@0
|
10 |
+#include <linux/dvb/audio.h>
|
|
nathan@0
|
11 |
+audio_mixer_t dvb_mixer={255,255};
|
|
nathan@0
|
12 |
#endif
|
|
nathan@0
|
13 |
extern int vo_mpegpes_fd;
|
|
nathan@0
|
14 |
diff -ruN ./libvo/vo_mpegpes.c /usr/src/MPlayer-0.90rc1/libvo/vo_mpegpes.c
|
|
nathan@0
|
15 |
--- ./libvo/vo_mpegpes.c Mon Nov 11 16:20:26 2002
|
|
nathan@0
|
16 |
+++ /usr/src/MPlayer-0.90rc1/libvo/vo_mpegpes.c Wed Dec 11 15:54:49 2002
|
|
nathan@0
|
17 |
@@ -35,12 +35,14 @@
|
|
nathan@0
|
18 |
#include <stdio.h>
|
|
nathan@0
|
19 |
#include <time.h>
|
|
nathan@0
|
20 |
|
|
nathan@0
|
21 |
-#include <ost/dmx.h>
|
|
nathan@0
|
22 |
-#include <ost/frontend.h>
|
|
nathan@0
|
23 |
-#include <ost/sec.h>
|
|
nathan@0
|
24 |
-#include <ost/video.h>
|
|
nathan@0
|
25 |
-#include <ost/audio.h>
|
|
nathan@0
|
26 |
-
|
|
nathan@0
|
27 |
+#include <linux/dvb/video.h>
|
|
nathan@0
|
28 |
+#include <linux/dvb/audio.h>
|
|
nathan@0
|
29 |
+#ifndef true
|
|
nathan@0
|
30 |
+#define true 1
|
|
nathan@0
|
31 |
+#endif
|
|
nathan@0
|
32 |
+#ifndef false
|
|
nathan@0
|
33 |
+#define false 0
|
|
nathan@0
|
34 |
+#endif
|
|
nathan@0
|
35 |
#endif
|
|
nathan@0
|
36 |
|
|
nathan@0
|
37 |
#include "config.h"
|
|
nathan@0
|
38 |
@@ -86,11 +88,11 @@
|
|
nathan@0
|
39 |
#ifdef HAVE_DVB
|
|
nathan@0
|
40 |
if(!arg){
|
|
nathan@0
|
41 |
//|O_NONBLOCK
|
|
nathan@0
|
42 |
- if((vo_mpegpes_fd = open("/dev/ost/video",O_RDWR)) < 0){
|
|
nathan@0
|
43 |
+ if((vo_mpegpes_fd = open("/dev/dvb/adapter0/video0",O_RDWR)) < 0){
|
|
nathan@0
|
44 |
perror("DVB VIDEO DEVICE: ");
|
|
nathan@0
|
45 |
return -1;
|
|
nathan@0
|
46 |
}
|
|
nathan@0
|
47 |
- if((vo_mpegpes_fd2 = open("/dev/ost/audio",O_RDWR|O_NONBLOCK)) < 0){
|
|
nathan@0
|
48 |
+ if((vo_mpegpes_fd2 = open("/dev/dvb/adapter0/audio0",O_RDWR|O_NONBLOCK)) < 0){
|
|
nathan@0
|
49 |
perror("DVB AUDIO DEVICE: ");
|
|
nathan@0
|
50 |
return -1;
|
|
nathan@0
|
51 |
}
|