[Mplayer-cvslog] CVS: main/libao2 ao_mpegpes.c,1.14,1.15

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var/tmp.root/cvs-serv18661/libao2

Modified Files:
	ao_mpegpes.c 
Log Message:
DVB-HEAD (aka. NEWSTRUCT) detection & support
patch by Dimitrios Dimitrakos <mail at dimitrios.de>


Index: ao_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_mpegpes.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ao_mpegpes.c	6 Oct 2002 01:08:04 -0000	1.14
+++ ao_mpegpes.c	28 Dec 2002 12:04:57 -0000	1.15
@@ -1,6 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef DVB_HEAD
+#define HAVE_DVB 1
+#endif
+
 #ifdef HAVE_DVB
 #include <sys/ioctl.h>
 #endif
@@ -15,8 +19,13 @@
 #include "../mp_msg.h"
 
 #ifdef HAVE_DVB
+#ifndef HAVE_DVB_HEAD
 #include <ost/audio.h>
 audioMixer_t dvb_mixer={255,255};
+#else
+#include </linux/dvb/audio.h>
+audio_mixer_t dvb_mixer={255,255};
+#endif
 #endif
 extern int vo_mpegpes_fd;
 extern int vo_mpegpes_fd2;