diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-25 22:03:33 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-25 22:03:33 +0000 |
| commit | a823205f9ff00fec422a2c1838cc1a85bd0f6776 (patch) | |
| tree | a9149b3954a2f40ae854679a91bcd12aef39e499 /libmpcodecs | |
| parent | b6ef6abbd528d5d6c703e3476b4aa203294408da (diff) | |
| download | mpv-a823205f9ff00fec422a2c1838cc1a85bd0f6776.tar.bz2 mpv-a823205f9ff00fec422a2c1838cc1a85bd0f6776.tar.xz | |
argh... Nick messed up driver names too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5344 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_a52.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ad_acm.c | 7 | ||||
| -rw-r--r-- | libmpcodecs/ad_dshow.c | 3 | ||||
| -rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/ad_mp3.c | 2 |
5 files changed, 14 insertions, 4 deletions
diff --git a/libmpcodecs/ad_a52.c b/libmpcodecs/ad_a52.c index f6cd640152..e4ab235ff6 100644 --- a/libmpcodecs/ad_a52.c +++ b/libmpcodecs/ad_a52.c @@ -29,7 +29,7 @@ static ad_info_t info = "" }; -LIBAD_EXTERN(a52) +LIBAD_EXTERN(liba52) extern int audio_output_channels; diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c index 5a74071489..943c7be623 100644 --- a/libmpcodecs/ad_acm.c +++ b/libmpcodecs/ad_acm.c @@ -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 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m { return acm_decode_audio(sh_audio,buf,minlen,maxlen); } +#endif diff --git a/libmpcodecs/ad_dshow.c b/libmpcodecs/ad_dshow.c index 369368e7e2..ff770ca094 100644 --- a/libmpcodecs/ad_dshow.c +++ b/libmpcodecs/ad_dshow.c @@ -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 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m // len=size_out; return size_out; } +#endif diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 9929ca2802..7de8ff8277 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -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 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m } return len; } + +#endif diff --git a/libmpcodecs/ad_mp3.c b/libmpcodecs/ad_mp3.c index 683ce09771..57309a34bf 100644 --- a/libmpcodecs/ad_mp3.c +++ b/libmpcodecs/ad_mp3.c @@ -15,7 +15,7 @@ static ad_info_t info = "Optimized to MMX/SSE/3Dnow!" }; -LIBAD_EXTERN(mp3) +LIBAD_EXTERN(mp3lib) #include "../mp3lib/mp3.h" |