From 60f223f76664437afda078bc46f4a0f1dedcbb06 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 21 Jun 2006 14:49:09 +0000 Subject: Move #ifdefs around complete files into the build system. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18774 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/Makefile | 148 ++++++++++++++++++++++++++++++-------------- libmpcodecs/ad_acm.c | 3 - libmpcodecs/ad_faad.c | 5 -- libmpcodecs/ad_liba52.c | 2 - libmpcodecs/ad_libdv.c | 5 -- libmpcodecs/ad_libmad.c | 3 - libmpcodecs/ad_libvorbis.c | 5 -- libmpcodecs/ad_mp3lib.c | 2 - libmpcodecs/ad_qtaudio.c | 7 +-- libmpcodecs/ad_realaud.c | 4 -- libmpcodecs/ad_twin.c | 4 -- libmpcodecs/vd_divx4.c | 5 -- libmpcodecs/vd_libdv.c | 4 -- libmpcodecs/vd_libmpeg2.c | 2 - libmpcodecs/vd_mpng.c | 4 -- libmpcodecs/vd_odivx.c | 5 -- libmpcodecs/vd_qtvideo.c | 10 +-- libmpcodecs/vd_realvid.c | 3 - libmpcodecs/vd_theora.c | 4 -- libmpcodecs/vd_vfw.c | 3 - libmpcodecs/vd_xanim.c | 2 - libmpcodecs/vd_xvid.c | 3 - libmpcodecs/vd_xvid4.c | 4 -- libmpcodecs/ve_divx4.c | 3 - libmpcodecs/ve_libdv.c | 3 - libmpcodecs/ve_qtvideo.c | 2 - libmpcodecs/ve_vfw.c | 2 - libmpcodecs/ve_xvid.c | 3 - libmpcodecs/ve_xvid4.c | 4 -- libmpcodecs/vf_fame.c | 3 - libmpcodecs/vf_screenshot.c | 3 - 31 files changed, 104 insertions(+), 156 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index c6b5ce7218..d773e680bd 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -10,10 +10,15 @@ LIBS+=$(LIBNAME2) endif AUDIO_SRCS_LIB=ad_hwac3.c \ - ad_liba52.c \ - ad_mp3lib.c \ ad_hwmpa.c \ +ifeq ($(LIBA52),yes) +AUDIO_SRCS_LIB+=ad_liba52.c +endif +ifeq ($(MP3LIB),yes) +AUDIO_SRCS_LIB+=ad_mp3lib.c +endif + AUDIO_SRCS_NAT=ad_alaw.c \ ad_dk3adpcm.c \ ad_dvdpcm.c \ @@ -22,35 +27,47 @@ AUDIO_SRCS_NAT=ad_alaw.c \ ad_msgsm.c \ ad_pcm.c \ -AUDIO_SRCS_OPT=ad_acm.c \ - ad_faad.c \ - ad_libdv.c \ - ad_libmad.c \ - ad_libvorbis.c \ - ad_qtaudio.c \ - ad_realaud.c \ - ad_twin.c \ +AUDIO_SRCS=dec_audio.c \ + ad.c \ + $(AUDIO_SRCS_LIB) \ + $(AUDIO_SRCS_NAT) \ ifeq ($(CONFIG_LIBAVCODEC),yes) -AUDIO_SRCS_OPT+=ad_ffmpeg.c +AUDIO_SRCS+=ad_ffmpeg.c endif ifeq ($(CONFIG_LIBAVCODEC_SO),yes) -AUDIO_SRCS_OPT+=ad_ffmpeg.c +AUDIO_SRCS+=ad_ffmpeg.c endif ifeq ($(WIN32DLL),yes) -AUDIO_SRCS_OPT+=ad_dshow.c ad_dmo.c +AUDIO_SRCS+=ad_acm.c ad_dmo.c ad_dshow.c ad_twin.c +endif +ifeq ($(QTX_CODECS),yes) +AUDIO_SRCS+=ad_qtaudio.c +endif +ifeq ($(REAL_CODECS),yes) +AUDIO_SRCS+=ad_realaud.c +endif +ifeq ($(FAAD),yes) +AUDIO_SRCS += ad_faad.c +endif +ifeq ($(LIBDV),yes) +AUDIO_SRCS+=ad_libdv.c +endif +ifeq ($(LIBMAD),yes) +AUDIO_SRCS+=ad_libmad.c +endif +ifeq ($(LIBVORBIS),yes) +AUDIO_SRCS+=ad_libvorbis.c endif -AUDIO_SRCS=dec_audio.c \ - ad.c \ - $(AUDIO_SRCS_LIB) \ - $(AUDIO_SRCS_NAT) \ - $(AUDIO_SRCS_OPT) \ -VIDEO_SRCS_LIB=vd_libmpeg2.c \ - vd_lzo.c \ +VIDEO_SRCS_LIB=vd_lzo.c \ vd_nuv.c \ +ifeq ($(LIBMPEG2),yes) +VIDEO_SRCS_LIB+=vd_libmpeg2.c +endif + VIDEO_SRCS_NAT=vd_hmblck.c \ vd_mpegpes.c \ vd_mtga.c \ @@ -58,34 +75,52 @@ VIDEO_SRCS_NAT=vd_hmblck.c \ vd_raw.c \ vd_sgi.c \ -VIDEO_SRCS_OPT=vd_divx4.c \ - vd_libdv.c \ - vd_odivx.c \ - vd_qtvideo.c \ - vd_realvid.c \ - vd_theora.c \ - vd_vfw.c \ - vd_vfwex.c \ - vd_xanim.c \ - vd_xvid4.c \ - vd_xvid.c \ - vd_zrmjpeg.c \ +VIDEO_SRCS=dec_video.c \ + vd.c \ + $(VIDEO_SRCS_NAT) \ + $(VIDEO_SRCS_LIB) \ ifeq ($(CONFIG_LIBAVCODEC),yes) -VIDEO_SRCS_OPT+=vd_ffmpeg.c +VIDEO_SRCS+=vd_ffmpeg.c endif ifeq ($(CONFIG_LIBAVCODEC_SO),yes) -VIDEO_SRCS_OPT+=vd_ffmpeg.c +VIDEO_SRCS+=vd_ffmpeg.c endif ifeq ($(WIN32DLL),yes) -VIDEO_SRCS_OPT+=vd_dmo.c vd_dshow.c +VIDEO_SRCS+=vd_dmo.c vd_dshow.c vd_vfw.c vd_vfwex.c +endif +ifeq ($(QTX_CODECS),yes) +VIDEO_SRCS+=vd_qtvideo.c +endif +ifeq ($(REAL_CODECS),yes) +VIDEO_SRCS+=vd_realvid.c +endif +ifeq ($(XANIM_CODECS),yes) +VIDEO_SRCS+=vd_xanim.c +endif +ifeq ($(LIBDV),yes) +VIDEO_SRCS+=vd_libdv.c +endif +ifeq ($(LIBTHEORA),yes) +VIDEO_SRCS+=vd_theora.c +endif +ifeq ($(DIVX),yes) +VIDEO_SRCS+=vd_odivx.c + ifneq ($(OPENDIVX),yes) + VIDEO_SRCS+=vd_divx4.c + endif +endif +ifeq ($(XVID4),yes) +VIDEO_SRCS+=vd_xvid4.c +else + ifeq ($(XVID),yes) + VIDEO_SRCS+=vd_xvid.c + endif +endif +ifeq ($(ZORAN),yes) +VIDEO_SRCS+=vd_zrmjpeg.c endif -VIDEO_SRCS=dec_video.c \ - vd.c \ - $(VIDEO_SRCS_NAT) \ - $(VIDEO_SRCS_LIB) \ - $(VIDEO_SRCS_OPT) \ VFILTER_SRCS=vf.c \ pullup.c \ @@ -150,7 +185,6 @@ VFILTER_SRCS=vf.c \ vf_yuvcsp.c \ vf_yuy2.c \ vf_yvu9.c \ - vf_screenshot.c \ vf_yadif.c \ VFILTER_LAVC_SRCS += vf_lavc.c \ @@ -177,17 +211,16 @@ ifeq ($(CONFIG_LIBAVCODEC_SO),yes) VFILTER_SRCS += $(VFILTER_LAVC_SRCS) endif +ifeq ($(PNG),yes) +VFILTER_SRCS += vf_screenshot.c +endif + + ENCODER_SRCS=ae.c \ ae_pcm.c \ ve.c \ - ve_divx4.c \ - ve_libdv.c \ ve_nuv.c \ - ve_qtvideo.c \ ve_raw.c \ - ve_vfw.c \ - ve_xvid4.c \ - ve_xvid.c \ ifeq ($(CONFIG_LIBAVCODEC),yes) ENCODER_SRCS+=ve_lavc.c @@ -195,11 +228,30 @@ endif ifeq ($(CONFIG_LIBAVCODEC_SO),yes) ENCODER_SRCS+=ve_lavc.c endif - +ifeq ($(WIN32DLL),yes) +ENCODER_SRCS+=ve_vfw.c +endif +ifeq ($(QTX_CODECS),yes) +ENCODER_SRCS+=ve_qtvideo.c +endif +ifeq ($(LIBDV),yes) +ENCODER_SRCS+=ve_libdv.c +endif +ifeq ($(XVID4),yes) +ENCODER_SRCS+=ve_xvid4.c +else + ifeq ($(XVID),yes) + ENCODER_SRCS+=ve_xvid.c + endif +endif +ifeq ($(DIVX4ENCORE),yes) +ENCODER_SRCS+=ve_divx4.c +endif ifeq ($(X264),yes) ENCODER_SRCS+=ve_x264.c endif + NATIVE_SRCS=native/minilzo.c \ native/nuppelvideo.c \ native/RTjpegN.c \ diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c index 73c5c11ca8..1049817dad 100644 --- a/libmpcodecs/ad_acm.c +++ b/libmpcodecs/ad_acm.c @@ -6,8 +6,6 @@ #include "mp_msg.h" #include "help_mp.h" -#ifdef USE_WIN32DLL - #include "wineacm.h" #include "ad_internal.h" @@ -243,4 +241,3 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m } return len; } -#endif diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index 315c4afa20..ce9ff96926 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -11,8 +11,6 @@ #include "config.h" #include "ad_internal.h" -#ifdef HAVE_FAAD - static ad_info_t info = { "AAC (MPEG2/4 Advanced Audio Coding)", @@ -284,6 +282,3 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) } return len; } - -#endif /* !HAVE_FAAD */ - diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index 82e21a9610..fe31d5e27b 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -5,7 +5,6 @@ #include #include "config.h" -#ifdef USE_LIBA52 #include "mp_msg.h" #include "help_mp.h" @@ -316,4 +315,3 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m assert(len <= maxlen); return len; } -#endif diff --git a/libmpcodecs/ad_libdv.c b/libmpcodecs/ad_libdv.c index 9107035be1..94f0c1f9d8 100644 --- a/libmpcodecs/ad_libdv.c +++ b/libmpcodecs/ad_libdv.c @@ -9,8 +9,6 @@ #include "mp_msg.h" #include "help_mp.h" -#ifdef HAVE_LIBDV095 - #include "img_format.h" #include @@ -111,6 +109,3 @@ static int decode_audio(sh_audio_t *audio, unsigned char *buf, int minlen, int m } return len*2; } - -#endif - diff --git a/libmpcodecs/ad_libmad.c b/libmpcodecs/ad_libmad.c index 67f35ef97b..076359a5b6 100644 --- a/libmpcodecs/ad_libmad.c +++ b/libmpcodecs/ad_libmad.c @@ -6,8 +6,6 @@ #include "config.h" -#ifdef USE_LIBMAD - #include "ad_internal.h" static ad_info_t info = { @@ -171,4 +169,3 @@ static int control(sh_audio_t *sh,int cmd,void* arg, ...){ } return CONTROL_UNKNOWN; } -#endif diff --git a/libmpcodecs/ad_libvorbis.c b/libmpcodecs/ad_libvorbis.c index 2d94ac4431..65944cc0ce 100644 --- a/libmpcodecs/ad_libvorbis.c +++ b/libmpcodecs/ad_libvorbis.c @@ -8,8 +8,6 @@ #include "config.h" #include "ad_internal.h" -#ifdef HAVE_OGGVORBIS - static ad_info_t info = { "Ogg/Vorbis audio decoder", @@ -322,6 +320,3 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) return len; } - -#endif /* !HAVE_OGGVORBIS */ - diff --git a/libmpcodecs/ad_mp3lib.c b/libmpcodecs/ad_mp3lib.c index 2605bb08f2..50c2c3e3eb 100644 --- a/libmpcodecs/ad_mp3lib.c +++ b/libmpcodecs/ad_mp3lib.c @@ -3,7 +3,6 @@ #include #include "config.h" -#ifdef USE_MP3LIB #include "ad_internal.h" @@ -80,4 +79,3 @@ 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/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index 9caea3cf78..141079f9ba 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -6,7 +6,6 @@ #include "config.h" #include "mp_msg.h" -#if defined(USE_QTX_CODECS) || defined(MACOSX) #include "wine/windef.h" #include "ad_internal.h" @@ -30,7 +29,7 @@ static ad_info_t info = { LIBAD_EXTERN(qtaudio) -#if defined(USE_QTX_CODECS) && !defined(MACOSX) +#if !defined(MACOSX) typedef struct OpaqueSoundConverter* SoundConverter; typedef unsigned long OSType; typedef unsigned long UnsignedFixed; @@ -164,7 +163,7 @@ static int loader_init() mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n"); return 0; } -#endif /* USE_QTX_CODECS */ +#endif /* #if !defined(MACOSX) */ static SoundConverter myConverter = NULL; static SoundComponentData InputFormatInfo,OutputFormatInfo; @@ -334,5 +333,3 @@ static int control(sh_audio_t *sh,int cmd,void* arg, ...){ // various optional functions you MAY implement: return CONTROL_UNKNOWN; } - -#endif diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c index 2517f2c349..53e4124191 100644 --- a/libmpcodecs/ad_realaud.c +++ b/libmpcodecs/ad_realaud.c @@ -5,8 +5,6 @@ #include "config.h" -#ifdef USE_REALCODECS - //#include #ifdef HAVE_LIBDL #include @@ -449,5 +447,3 @@ static int control(sh_audio_t *sh,int cmd,void* arg, ...){ } return CONTROL_UNKNOWN; } - -#endif diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c index fc04bfa424..b20ef96579 100644 --- a/libmpcodecs/ad_twin.c +++ b/libmpcodecs/ad_twin.c @@ -3,8 +3,6 @@ #include #include "config.h" -#ifdef USE_WIN32DLL - #include "ad_internal.h" #include "vqf.h" #include "loader/ldt_keeper.h" @@ -506,5 +504,3 @@ int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) } return len; } - -#endif diff --git a/libmpcodecs/vd_divx4.c b/libmpcodecs/vd_divx4.c index 895d25777a..a06a7d955e 100644 --- a/libmpcodecs/vd_divx4.c +++ b/libmpcodecs/vd_divx4.c @@ -7,9 +7,6 @@ #include "mp_msg.h" #include "help_mp.h" -#ifdef USE_DIVX -#ifdef NEW_DECORE - #include "vd_internal.h" static vd_info_t info = { @@ -328,5 +325,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } -#endif /* NEW_DECORE */ -#endif /* USE_DIVX */ diff --git a/libmpcodecs/vd_libdv.c b/libmpcodecs/vd_libdv.c index 5d5713bb0b..fbee399004 100644 --- a/libmpcodecs/vd_libdv.c +++ b/libmpcodecs/vd_libdv.c @@ -7,8 +7,6 @@ #include "config.h" -#ifdef HAVE_LIBDV095 - #include "img_format.h" #include @@ -83,5 +81,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) return mpi; } -#endif - diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c index 3db1ca85f0..756d632025 100644 --- a/libmpcodecs/vd_libmpeg2.c +++ b/libmpcodecs/vd_libmpeg2.c @@ -2,7 +2,6 @@ #include #include "config.h" -#ifdef USE_LIBMPEG2 #include "mp_msg.h" @@ -269,4 +268,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ } } } -#endif diff --git a/libmpcodecs/vd_mpng.c b/libmpcodecs/vd_mpng.c index 730385015f..a92852cfec 100644 --- a/libmpcodecs/vd_mpng.c +++ b/libmpcodecs/vd_mpng.c @@ -4,8 +4,6 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_PNG - #include #include "bswap.h" @@ -160,5 +158,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } - -#endif diff --git a/libmpcodecs/vd_odivx.c b/libmpcodecs/vd_odivx.c index 986814939a..907b5438a9 100644 --- a/libmpcodecs/vd_odivx.c +++ b/libmpcodecs/vd_odivx.c @@ -6,8 +6,6 @@ #include "mp_msg.h" #include "help_mp.h" -#ifdef USE_DIVX - #include "vd_internal.h" static vd_info_t info = { @@ -296,6 +294,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } - -#endif - diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index 20e68d6ab3..c1337dbe8d 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -3,7 +3,6 @@ #include "config.h" -#if defined(USE_QTX_CODECS) || defined(MACOSX) #include "wine/windef.h" #include "mp_msg.h" @@ -30,11 +29,7 @@ LIBVD_EXTERN(qtvideo) #define dump_ImageDescription(x) #else #include "qtx/qtxsdk/components.h" -#endif - -#if defined(USE_QTX_CODECS) && !defined(MACOSX) //#include "wine/windef.h" - HMODULE WINAPI LoadLibraryA(LPCSTR); FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); int WINAPI FreeLibrary(HMODULE); @@ -55,7 +50,7 @@ static ImageDescriptionHandle framedescHandle; static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts static HMODULE handler; -#if defined(USE_QTX_CODECS) && !defined(MACOSX) +#if !defined(MACOSX) static Component (*FindNextComponent)(Component prev,ComponentDescription* desc); static OSErr (*GetComponentInfo)(Component prev,ComponentDescription* desc,Handle h1,Handle h2,Handle h3); static long (*CountComponents)(ComponentDescription* desc); @@ -90,7 +85,7 @@ static OSErr (*QTNewGWorldFromPtr)(GWorldPtr *gw, void *baseAddr, long rowBytes); static OSErr (*NewHandleClear)(Size byteCount); -#endif /* #if defined(USE_QTX_CODECS) && !defined(MACOSX) */ +#endif /* #if !defined(MACOSX) */ // to set/get/query special features/parameters static int control(sh_video_t *sh,int cmd,void* arg,...){ @@ -438,4 +433,3 @@ if((int)sh->context==0x73797639){ // Sorenson 16-bit YUV -> std YVU9 return mpi; } -#endif /* #if defined(USE_QTX_CODECS) || defined(MACOSX) */ diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c index 4a0702bb85..4c5db1d624 100644 --- a/libmpcodecs/vd_realvid.c +++ b/libmpcodecs/vd_realvid.c @@ -2,7 +2,6 @@ #include #include "config.h" -#ifdef USE_REALCODECS #ifdef HAVE_LIBDL #include @@ -356,5 +355,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return (result?NULL:mpi); } - -#endif diff --git a/libmpcodecs/vd_theora.c b/libmpcodecs/vd_theora.c index 8841ccb5f9..de9d478c62 100644 --- a/libmpcodecs/vd_theora.c +++ b/libmpcodecs/vd_theora.c @@ -7,8 +7,6 @@ #include "mp_msg.h" #include "help_mp.h" -#ifdef HAVE_OGGTHEORA - #include "vd_internal.h" static vd_info_t info = { @@ -179,5 +177,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) return mpi; } - -#endif diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c index 6f94b0f5b5..2f696f0be7 100644 --- a/libmpcodecs/vd_vfw.c +++ b/libmpcodecs/vd_vfw.c @@ -5,8 +5,6 @@ #include "mp_msg.h" #include "help_mp.h" -#ifdef USE_WIN32DLL - #include "vd_internal.h" #include "wine/driver.h" @@ -341,4 +339,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } -#endif diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c index 54acdcbd93..91252975ab 100644 --- a/libmpcodecs/vd_xanim.c +++ b/libmpcodecs/vd_xanim.c @@ -14,7 +14,6 @@ #include "config.h" -#ifdef USE_XANIM #include "mp_msg.h" #include "vd_internal.h" @@ -822,4 +821,3 @@ static mp_image_t* decode(sh_video_t *sh, void *data, int len, int flags) return priv->mpi; } -#endif diff --git a/libmpcodecs/vd_xvid.c b/libmpcodecs/vd_xvid.c index f2ca6a152b..b3b2ac4714 100644 --- a/libmpcodecs/vd_xvid.c +++ b/libmpcodecs/vd_xvid.c @@ -4,8 +4,6 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_XVID3 - #include "vd_internal.h" #include "m_option.h" @@ -247,4 +245,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } -#endif //have_xvid diff --git a/libmpcodecs/vd_xvid4.c b/libmpcodecs/vd_xvid4.c index 57b07cb401..a2471ead3c 100644 --- a/libmpcodecs/vd_xvid4.c +++ b/libmpcodecs/vd_xvid4.c @@ -31,8 +31,6 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_XVID4 - #include "vd_internal.h" #include "m_option.h" @@ -391,7 +389,5 @@ static vd_info_t info = LIBVD_EXTERN(xvid) -#endif /* HAVE_XVID4 */ - /* Please do not change that tag comment. * arch-tag: b7d654a5-76ea-4768-9713-2c791567fe7d mplayer xvid decoder module */ diff --git a/libmpcodecs/ve_divx4.c b/libmpcodecs/ve_divx4.c index 138c806218..50feba6ff2 100644 --- a/libmpcodecs/ve_divx4.c +++ b/libmpcodecs/ve_divx4.c @@ -5,8 +5,6 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_DIVX4ENCORE - #include "codec-cfg.h" #include "stream.h" #include "demuxer.h" @@ -488,4 +486,3 @@ vf_info_t ve_info_divx4 = { }; //===========================================================================// -#endif diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c index 3d4fd56a2e..48c2b7fd06 100644 --- a/libmpcodecs/ve_libdv.c +++ b/libmpcodecs/ve_libdv.c @@ -8,8 +8,6 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_LIBDV095 - #include "codec-cfg.h" #include "stream.h" #include "demuxer.h" @@ -116,4 +114,3 @@ vf_info_t ve_info_libdv = { }; //===========================================================================// -#endif diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c index 6050e59860..da73cde792 100644 --- a/libmpcodecs/ve_qtvideo.c +++ b/libmpcodecs/ve_qtvideo.c @@ -16,7 +16,6 @@ #include "ldt_keeper.h" #endif -#ifdef USE_QTX_CODECS #include "loader/qtx/qtxsdk/components.h" #include "wine/windef.h" @@ -341,4 +340,3 @@ vf_info_t ve_info_qtvideo = { }; //===========================================================================// -#endif diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index 7dfc84a29c..16458f012c 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -5,7 +5,6 @@ #include #include "config.h" -#ifdef USE_WIN32DLL #include "mp_msg.h" #include "help_mp.h" @@ -290,4 +289,3 @@ vf_info_t ve_info_vfw = { }; //===========================================================================// -#endif diff --git a/libmpcodecs/ve_xvid.c b/libmpcodecs/ve_xvid.c index cf2016c73a..05c15a2932 100644 --- a/libmpcodecs/ve_xvid.c +++ b/libmpcodecs/ve_xvid.c @@ -12,8 +12,6 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_XVID3 - #include "codec-cfg.h" #include "stream.h" #include "demuxer.h" @@ -587,4 +585,3 @@ vf_info_t ve_info_xvid = { }; //===========================================================================// -#endif diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c index b0a5ddfd8f..1c6fa61dc2 100644 --- a/libmpcodecs/ve_xvid4.c +++ b/libmpcodecs/ve_xvid4.c @@ -36,8 +36,6 @@ #include "config.h" #include "mp_msg.h" -#ifdef HAVE_XVID4 - #include "codec-cfg.h" #include "stream.h" #include "demuxer.h" @@ -1597,7 +1595,5 @@ vf_info_t ve_info_xvid = { }; -#endif /* HAVE_XVID4 */ - /* Please do not change that tag comment. * arch-tag: 42ccc257-0548-4a3e-9617-2876c4e8ac88 mplayer xvid encoder module */ diff --git a/libmpcodecs/vf_fame.c b/libmpcodecs/vf_fame.c index 6eeb29530d..9bc60da28d 100644 --- a/libmpcodecs/vf_fame.c +++ b/libmpcodecs/vf_fame.c @@ -7,8 +7,6 @@ #include "mp_msg.h" #include "help_mp.h" -//#ifdef USE_LIBFAME - // 100=best >=80 very good >=50 fast #define QUALITY 90 @@ -151,4 +149,3 @@ vf_info_t vf_info_fame = { }; //===========================================================================// -//#endif diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c index 2998aa77ca..60231ea3a1 100644 --- a/libmpcodecs/vf_screenshot.c +++ b/libmpcodecs/vf_screenshot.c @@ -1,5 +1,4 @@ #include "config.h" -#ifdef HAVE_PNG #include #include @@ -299,5 +298,3 @@ vf_info_t vf_info_screenshot = { }; //===========================================================================// - -#endif /* HAVE_PNG */ -- cgit v1.2.3