Index: configure
===================================================================
--- configure	(revision 34647)
+++ configure	(working copy)
@@ -7068,7 +7068,7 @@
   # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
   libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
   # needed for codec id -> tag conversion
-  libavmuxers="AVI_MUXER"
+  libavmuxers="AVI_MUXER WAV_MUXER"
 fi
 echores "$_mencoder"
 
Index: libmpdemux/mp_taglists.c
===================================================================
--- libmpdemux/mp_taglists.c	(revision 34647)
+++ libmpdemux/mp_taglists.c	(working copy)
@@ -161,16 +161,16 @@
 
 enum CodecID mp_tag2codec_id(uint32_t tag, int audio)
 {
-    AVOutputFormat *avi_format;
+    AVOutputFormat *av_format;
     enum CodecID id = av_codec_get_id(audio ? mp_wav_taglists : mp_bmp_taglists, tag);
     if (id != CODEC_ID_NONE)
         return id;
-    avi_format = av_guess_format("avi", NULL, NULL);
-    if (!avi_format) {
-        mp_msg(MSGT_DEMUXER, MSGL_FATAL, "MPlayer cannot work properly without AVI muxer in libavformat!\n");
+    av_format = av_guess_format(audio ? "wav" : "avi", NULL, NULL);
+    if (!av_format) {
+        mp_msg(MSGT_DEMUXER, MSGL_FATAL, "MPlayer cannot work properly without %s muxer in libavformat!\n", audio ? "WAV" : "AVI");
         return 0;
     }
-    return av_codec_get_id(avi_format->codec_tag, tag);
+    return av_codec_get_id(av_format->codec_tag, tag);
 }
 
 uint32_t mp_codec_id2tag(enum CodecID codec_id, uint32_t old_tag, int audio)