Index: libao2/audio_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/audio_out.c,v
retrieving revision 1.41
diff -u -r1.41 audio_out.c
--- libao2/audio_out.c	1 Oct 2004 19:51:02 -0000	1.41
+++ libao2/audio_out.c	3 Oct 2004 18:39:39 -0000
@@ -138,6 +138,11 @@
     if(ao_list && ao_list[0])
       while(ao_list[0][0]){
         char* ao=strdup(ao_list[0]);
+        if (strncmp(ao, "alsa9", 5) == 0 || strncmp(ao, "alsa1x", 6) == 0) {
+          mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_ALSA9_1x_Removed);
+          free(ao);
+          return NULL;
+        }
 	ao_subdevice=strchr(ao,':');
 	if(ao_subdevice){
 	    ao_subdevice[0]=0;
Index: help/help_mp-en.h
===================================================================
RCS file: /cvsroot/mplayer/main/help/help_mp-en.h,v
retrieving revision 1.140
diff -u -r1.140 help_mp-en.h
--- help/help_mp-en.h	2 Oct 2004 14:16:09 -0000	1.140
+++ help/help_mp-en.h	3 Oct 2004 18:39:44 -0000
@@ -799,6 +801,9 @@
 
 // libao2 
 
+// audio_out.c
+#define MSGTR_AO_ALSA9_1x_Removed "audio_out: alsa9 and alsa1x modules were removed, use alsa instead.\n"
+
 // ao_oss.c
 #define MSGTR_AO_OSS_CantOpenMixer "[AO OSS] audio_setup: Can't open mixer device %s: %s\n"
 #define MSGTR_AO_OSS_ChanNotFound "[AO OSS] audio_setup: Audio card mixer does not have channel '%s' using default.\n"