From 26c9b4ee5edfb50dd4684a19aa97ad7651c42a7c Mon Sep 17 00:00:00 2001 From: arpi Date: Fri, 30 Aug 2002 20:06:22 +0000 Subject: [PATCH] sync driver names with codec-cfg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7175 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad.c | 8 ++++---- libmpcodecs/ad_faad.c | 2 +- libmpcodecs/ad_libvorbis.c | 2 +- libmpcodecs/ad_realaud.c | 4 ++-- libmpcodecs/vd_realvid.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c index d5b8ec2a4d..1e7db6b667 100644 --- a/libmpcodecs/ad.c +++ b/libmpcodecs/ad.c @@ -32,9 +32,9 @@ extern ad_functions_t mpcodecs_ad_dshow; extern ad_functions_t mpcodecs_ad_acm; extern ad_functions_t mpcodecs_ad_msgsm; extern ad_functions_t mpcodecs_ad_faad; -extern ad_functions_t mpcodecs_ad_vorbis; +extern ad_functions_t mpcodecs_ad_libvorbis; extern ad_functions_t mpcodecs_ad_libmad; -extern ad_functions_t mpcodecs_ad_real; +extern ad_functions_t mpcodecs_ad_realaud; extern ad_functions_t mpcodecs_ad_libdv; ad_functions_t* mpcodecs_ad_drivers[] = @@ -64,13 +64,13 @@ ad_functions_t* mpcodecs_ad_drivers[] = &mpcodecs_ad_faad, #endif #ifdef HAVE_OGGVORBIS - &mpcodecs_ad_vorbis, + &mpcodecs_ad_libvorbis, #endif #ifdef USE_LIBMAD &mpcodecs_ad_libmad, #endif #ifdef USE_REALCODECS - &mpcodecs_ad_real, + &mpcodecs_ad_realaud, #endif #ifdef HAVE_LIBDV095 &mpcodecs_ad_libdv, diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index e1e0dbcc0a..bd210d96f9 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -16,7 +16,7 @@ static ad_info_t info = { "AAC (MPEG2/4 Advanced Audio Coding)", - "libfaad2", + "faad", AFM_AAC, "Felix Buenemann", "faad2", diff --git a/libmpcodecs/ad_libvorbis.c b/libmpcodecs/ad_libvorbis.c index 872c523b87..526667ea4e 100644 --- a/libmpcodecs/ad_libvorbis.c +++ b/libmpcodecs/ad_libvorbis.c @@ -18,7 +18,7 @@ static ad_info_t info = "buggy" }; -LIBAD_EXTERN(vorbis) +LIBAD_EXTERN(libvorbis) #include diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c index ad1f8e7502..09cbbc678c 100644 --- a/libmpcodecs/ad_realaud.c +++ b/libmpcodecs/ad_realaud.c @@ -14,14 +14,14 @@ static ad_info_t info = { "RealAudio decoder", - "real", + "realaud", AFM_REAL, "A'rpi", "Florian Schneider", "binary real audio codecs" }; -LIBAD_EXTERN(real) +LIBAD_EXTERN(realaud) static void *handle=NULL; diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c index e89ea55338..cd5de310c9 100644 --- a/libmpcodecs/vd_realvid.c +++ b/libmpcodecs/vd_realvid.c @@ -13,14 +13,14 @@ static vd_info_t info = { "RealVideo decoder", - "real", + "realvid", VFM_REAL, "Florian Schneider & A'rpi", "using original closed source codecs for Linux", "binary real video codecs" }; -LIBVD_EXTERN(real) +LIBVD_EXTERN(realvid) unsigned long (*rvyuv_custom_message)(unsigned long,unsigned long);