[Mplayer-cvslog] CVS: main/libmpcodecs ad_a52.c,1.2,1.3 ad_acm.c,1.1,1.2 ad_dshow.c,1.1,1.2 ad_ffmpeg.c,1.1,1.2 ad_mp3.c,1.1,1.2

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mplayer:/var/tmp.root/cvs-serv3769

Modified Files:
	ad_a52.c ad_acm.c ad_dshow.c ad_ffmpeg.c ad_mp3.c 
Log Message:
argh... Nick messed up driver names too

Index: ad_a52.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_a52.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ad_a52.c	25 Mar 2002 21:13:02 -0000	1.2
+++ ad_a52.c	25 Mar 2002 22:03:33 -0000	1.3
@@ -29,7 +29,7 @@
 	""
 };
 
-LIBAD_EXTERN(a52)
+LIBAD_EXTERN(liba52)
 
 extern int audio_output_channels;
 

Index: ad_acm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_acm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ad_acm.c	25 Mar 2002 21:06:01 -0000	1.1
+++ ad_acm.c	25 Mar 2002 22:03:33 -0000	1.2
@@ -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

Index: ad_dshow.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_dshow.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ad_dshow.c	25 Mar 2002 21:06:01 -0000	1.1
+++ ad_dshow.c	25 Mar 2002 22:03:33 -0000	1.2
@@ -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

Index: ad_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_ffmpeg.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ad_ffmpeg.c	25 Mar 2002 21:06:01 -0000	1.1
+++ ad_ffmpeg.c	25 Mar 2002 22:03:33 -0000	1.2
@@ -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

Index: ad_mp3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_mp3.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ad_mp3.c	25 Mar 2002 21:06:01 -0000	1.1
+++ ad_mp3.c	25 Mar 2002 22:03:33 -0000	1.2
@@ -15,7 +15,7 @@
 	"Optimized to MMX/SSE/3Dnow!"
 };
 
-LIBAD_EXTERN(mp3)
+LIBAD_EXTERN(mp3lib)
 
 #include "../mp3lib/mp3.h"