[Mplayer-cvslog] CVS: main/libao2 audio_out.c,1.35,1.36

[joy_ping CVS]

CVS change done by joy_ping CVS

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv8275

Modified Files:
	audio_out.c 
Log Message:
changes for alsa9/1.x-merge only alsa


Index: audio_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/audio_out.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- audio_out.c	11 Jan 2004 17:07:32 -0000	1.35
+++ audio_out.c	12 May 2004 22:48:15 -0000	1.36
@@ -27,10 +27,10 @@
  extern ao_functions_t audio_out_alsa5;
 #endif
 #ifdef HAVE_ALSA9
- extern ao_functions_t audio_out_alsa9;
+ extern ao_functions_t audio_out_alsa;
 #endif
 #ifdef HAVE_ALSA1X
- extern ao_functions_t audio_out_alsa1x;
+ extern ao_functions_t audio_out_alsa;
 #endif
 #ifdef HAVE_NAS
 extern ao_functions_t audio_out_nas;
@@ -76,10 +76,10 @@
         &audio_out_oss,
 #endif
 #ifdef HAVE_ALSA1X
-	&audio_out_alsa1x,
+	&audio_out_alsa,
 #endif
 #ifdef HAVE_ALSA9
-	&audio_out_alsa9,
+	&audio_out_alsa,
 #endif
 #ifdef HAVE_ALSA5
 	&audio_out_alsa5,