From e602a125f0024e4242f9ccc6001325e4f4745174 Mon Sep 17 00:00:00 2001
From: atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 26 Apr 2002 17:18:02 +0000
Subject: Allow disabling of libfame and allow to enforce (not) building
 libavcodec.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5841 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/Makefile | 6 +++++-
 libmpcodecs/vf.c     | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'libmpcodecs')

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 39dc92ecd7..90140e244e 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -6,10 +6,14 @@ LIBNAME2 = libmpencoders.a
 
 AUDIO_SRCS=dec_audio.c ad.c ad_a52.c ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dk4adpcm.c ad_dshow.c ad_dvdpcm.c ad_ffmpeg.c ad_hwac3.c ad_imaadpcm.c ad_mp3.c ad_msadpcm.c ad_pcm.c ad_roqaudio.c ad_msgsm.c ad_faad.c ad_vorbis.c ad_libmad.c
 VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_zlib.c vd_mpegpes.c
-VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_fame.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c
+VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c
 ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c
 NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c
 
+ifeq ($(FAME),yes)
+VFILTER_SRCS += vf_fame.c
+endif
+
 ifeq ($(PNG),yes)
 VIDEO_SRCS += vd_mpng.c
 endif
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index fb48e4f7b6..1a990de623 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -14,7 +14,9 @@ extern vf_info_t vf_info_crop;
 extern vf_info_t vf_info_expand;
 extern vf_info_t vf_info_pp;
 extern vf_info_t vf_info_scale;
+#ifdef USE_LIBFAME
 extern vf_info_t vf_info_fame;
+#endif
 extern vf_info_t vf_info_format;
 extern vf_info_t vf_info_yuy2;
 extern vf_info_t vf_info_flip;
@@ -33,7 +35,9 @@ static vf_info_t* filter_list[]={
     &vf_info_scale,
 //    &vf_info_osd,
     &vf_info_vo,
+#ifdef USE_LIBFAME
     &vf_info_fame,
+#endif
     &vf_info_format,
     &vf_info_yuy2,
     &vf_info_flip,
-- 
cgit v1.2.3