Index: libao2/audio_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/audio_out.c,v
retrieving revision 1.40
diff -u -r1.40 audio_out.c
--- libao2/audio_out.c	25 Sep 2004 15:34:42 -0000	1.40
+++ libao2/audio_out.c	30 Sep 2004 16:03:40 -0000
@@ -156,6 +156,7 @@
 	    }
 	}
         // continue...
+	free(ao);
 	++ao_list;
 	if(!(ao_list[0])) return NULL; // do NOT fallback to others
       }
Index: libmpdemux/demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.168
diff -u -r1.168 demuxer.c
--- libmpdemux/demuxer.c	23 Sep 2004 23:01:48 -0000	1.168
+++ libmpdemux/demuxer.c	30 Sep 2004 16:03:43 -0000
@@ -703,11 +703,12 @@
       if(id==formtypeAVI){ 
         mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"AVI");
         file_format=DEMUXER_TYPE_AVI;
-      } else {
-        free_demuxer(demuxer);
-        demuxer = NULL;
       }	
     }
+    if (file_format==DEMUXER_TYPE_UNKNOWN) {
+      free_demuxer(demuxer);
+      demuxer = NULL;
+    }
   }
 }
 //=============== Try to open as Y4M file: =================