# HG changeset patch
# User arpi
# Date 1017093813 0
# Node ID 3dd532400d44d833a29507e205f68841765fd98c
# Parent  c4cf81b3af71c4442fa8c33f8f4c46b95fb449db
argh... Nick messed up driver names too

diff -r c4cf81b3af71 -r 3dd532400d44 libmpcodecs/ad_a52.c
--- a/libmpcodecs/ad_a52.c	Mon Mar 25 21:23:06 2002 +0000
+++ b/libmpcodecs/ad_a52.c	Mon Mar 25 22:03:33 2002 +0000
@@ -29,7 +29,7 @@
 	""
 };
 
-LIBAD_EXTERN(a52)
+LIBAD_EXTERN(liba52)
 
 extern int audio_output_channels;
 
diff -r c4cf81b3af71 -r 3dd532400d44 libmpcodecs/ad_acm.c
--- a/libmpcodecs/ad_acm.c	Mon Mar 25 21:23:06 2002 +0000
+++ b/libmpcodecs/ad_acm.c	Mon Mar 25 22:03:33 2002 +0000
@@ -6,19 +6,21 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
+#ifdef USE_WIN32DLL
+
 #include "ad_internal.h"
 
 static ad_info_t info = 
 {
 	"Win32 ACM audio decoder",
-	"msacm",
+	"acm",
 	AFM_ACM,
 	"Nick Kurshev",
 	"avifile.sf.net",
 	""
 };
 
-LIBAD_EXTERN(msacm)
+LIBAD_EXTERN(acm)
 
 #include "dll_init.h"
 
@@ -74,3 +76,4 @@
 {
   return acm_decode_audio(sh_audio,buf,minlen,maxlen);
 }
+#endif
diff -r c4cf81b3af71 -r 3dd532400d44 libmpcodecs/ad_dshow.c
--- a/libmpcodecs/ad_dshow.c	Mon Mar 25 21:23:06 2002 +0000
+++ b/libmpcodecs/ad_dshow.c	Mon Mar 25 22:03:33 2002 +0000
@@ -6,6 +6,8 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
+#ifdef USE_DIRECTSHOW
+
 #include "ad_internal.h"
 
 static ad_info_t info = 
@@ -97,3 +99,4 @@
 //        len=size_out;
   return size_out;
 }
+#endif
diff -r c4cf81b3af71 -r 3dd532400d44 libmpcodecs/ad_ffmpeg.c
--- a/libmpcodecs/ad_ffmpeg.c	Mon Mar 25 21:23:06 2002 +0000
+++ b/libmpcodecs/ad_ffmpeg.c	Mon Mar 25 22:03:33 2002 +0000
@@ -6,6 +6,8 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
+#ifdef USE_LIBAVCODEC
+
 #include "ad_internal.h"
 
 #include "bswap.h"
@@ -104,3 +106,5 @@
     }
   return len;
 }
+
+#endif
diff -r c4cf81b3af71 -r 3dd532400d44 libmpcodecs/ad_mp3.c
--- a/libmpcodecs/ad_mp3.c	Mon Mar 25 21:23:06 2002 +0000
+++ b/libmpcodecs/ad_mp3.c	Mon Mar 25 22:03:33 2002 +0000
@@ -15,7 +15,7 @@
 	"Optimized to MMX/SSE/3Dnow!"
 };
 
-LIBAD_EXTERN(mp3)
+LIBAD_EXTERN(mp3lib)
 
 #include "../mp3lib/mp3.h"