Mercurial > mplayer.hg

changeset 5343:3dd532400d44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
argh... Nick messed up driver names too
author arpi
date Mon, 25 Mar 2002 22:03:33 +0000
parents c4cf81b3af71
children 7198d3eba09f
files libmpcodecs/ad_a52.c libmpcodecs/ad_acm.c libmpcodecs/ad_dshow.c libmpcodecs/ad_ffmpeg.c libmpcodecs/ad_mp3.c
diffstat 5 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
 
--- 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
--- 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
--- 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
--- 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"