From 94b6f5babac8c35c6ffcd238985980fc44aa3eeb Mon Sep 17 00:00:00 2001 From: arpi Date: Fri, 1 Nov 2002 16:40:15 +0000 Subject: [PATCH] usage of libmpeg2, liba52, mp3lib & svq1 can be disabled git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8027 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad.c | 4 ++++ libmpcodecs/ad_hwac3.c | 3 +++ libmpcodecs/ad_liba52.c | 3 +++ libmpcodecs/ad_mp3lib.c | 3 +++ libmpcodecs/native/svq1.c | 4 ++++ libmpcodecs/vd.c | 4 ++++ libmpcodecs/vd_libmpeg2.c | 3 +++ libmpcodecs/vd_svq1.c | 3 +++ 8 files changed, 27 insertions(+) diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c index 52cbaf4a45..44ef6370f5 100644 --- a/libmpcodecs/ad.c +++ b/libmpcodecs/ad.c @@ -41,9 +41,13 @@ extern ad_functions_t mpcodecs_ad_qtaudio; ad_functions_t* mpcodecs_ad_drivers[] = { // &mpcodecs_ad_null, +#ifdef USE_MP3LIB &mpcodecs_ad_mp3lib, +#endif +#ifdef USE_LIBA52 &mpcodecs_ad_liba52, &mpcodecs_ad_hwac3, +#endif #ifdef USE_LIBAVCODEC &mpcodecs_ad_ffmpeg, #endif diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index 6e739f12da..59f4533270 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -7,6 +7,8 @@ #include #include "config.h" +#ifdef USE_LIBA52 + #include "mp_msg.h" #include "help_mp.h" @@ -102,3 +104,4 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m return 6144; } +#endif diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index a309fa5e89..ee20284251 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -3,6 +3,8 @@ #include #include "config.h" +#ifdef USE_LIBA52 + #include "mp_msg.h" #include "help_mp.h" @@ -189,3 +191,4 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m } return len; } +#endif diff --git a/libmpcodecs/ad_mp3lib.c b/libmpcodecs/ad_mp3lib.c index ef544f465d..0522c16e01 100644 --- a/libmpcodecs/ad_mp3lib.c +++ b/libmpcodecs/ad_mp3lib.c @@ -3,6 +3,8 @@ #include #include "config.h" +#ifdef USE_MP3LIB + #include "ad_internal.h" static ad_info_t info = @@ -77,3 +79,4 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m { return MP3_DecodeFrame(buf,-1); } +#endif diff --git a/libmpcodecs/native/svq1.c b/libmpcodecs/native/svq1.c index 2d64174d64..b662400c17 100644 --- a/libmpcodecs/native/svq1.c +++ b/libmpcodecs/native/svq1.c @@ -26,6 +26,9 @@ #include #include "../../config.h" + +#ifdef USE_SVQ1 + #include "bswap.h" /* variable length (bit) code */ @@ -793,3 +796,4 @@ void svq1_free (svq1_t *svq1){ } } +#endif diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 6f7ea142ad..dac2da5eb6 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -97,13 +97,17 @@ vd_functions_t* mpcodecs_vd_drivers[] = { &mpcodecs_vd_ijpg, #endif &mpcodecs_vd_mtga, +#ifdef USE_LIBMPEG2 &mpcodecs_vd_libmpeg2, +#endif &mpcodecs_vd_huffyuv, &mpcodecs_vd_mpegpes, #ifdef USE_REALCODECS &mpcodecs_vd_realvid, #endif +#ifdef USE_SVQ1 &mpcodecs_vd_svq1, +#endif #ifdef HAVE_XVID &mpcodecs_vd_xvid, #endif diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c index 389a351028..3e525172b5 100644 --- a/libmpcodecs/vd_libmpeg2.c +++ b/libmpcodecs/vd_libmpeg2.c @@ -2,6 +2,8 @@ #include #include "config.h" +#ifdef USE_LIBMPEG2 + #include "mp_msg.h" #include "vd_internal.h" @@ -303,3 +305,4 @@ while(current #include "config.h" +#ifdef USE_SVQ1 + #include "mp_msg.h" #include "vd_internal.h" @@ -85,3 +87,4 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } +#endif