github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-07-23 19:21:29 +02:00
Code Releases Activity

Move conditional compilation out of the code and into the build system.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17524 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-01-31 23:36:12 +00:00
parent 8c317f72a7
commit 872a28cc57
11 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libmpcodecs/Makefile
View File

@ -21,7 +21,6 @@ AUDIO_SRCS_OPT=ad_acm.c \
ad_dmo.c \ ad_dmo.c \
ad_dshow.c \ ad_dshow.c \
ad_faad.c \ ad_faad.c \
ad_ffmpeg.c \
ad_libdv.c \ ad_libdv.c \
ad_libmad.c \ ad_libmad.c \
ad_libvorbis.c \ ad_libvorbis.c \
@ -29,6 +28,13 @@ AUDIO_SRCS_OPT=ad_acm.c \
ad_realaud.c \ ad_realaud.c \
ad_twin.c \ ad_twin.c \
ifeq ($(CONFIG_LIBAVCODEC),yes)
AUDIO_SRCS_OPT+=ad_ffmpeg.c
endif
ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
AUDIO_SRCS_OPT+=ad_ffmpeg.c
endif
AUDIO_SRCS=dec_audio.c \ AUDIO_SRCS=dec_audio.c \
ad.c \ ad.c \
$(AUDIO_SRCS_LIB) \ $(AUDIO_SRCS_LIB) \
@ -49,7 +55,6 @@ VIDEO_SRCS_NAT=vd_hmblck.c \
VIDEO_SRCS_OPT=vd_divx4.c \ VIDEO_SRCS_OPT=vd_divx4.c \
vd_dmo.c \ vd_dmo.c \
vd_dshow.c \ vd_dshow.c \
vd_ffmpeg.c\
vd_libdv.c \ vd_libdv.c \
vd_odivx.c \ vd_odivx.c \
vd_qtvideo.c \ vd_qtvideo.c \
@ -62,6 +67,13 @@ VIDEO_SRCS_OPT=vd_divx4.c \
vd_xvid.c \ vd_xvid.c \
vd_zrmjpeg.c \ vd_zrmjpeg.c \
ifeq ($(CONFIG_LIBAVCODEC),yes)
VIDEO_SRCS_OPT+=vd_ffmpeg.c
endif
ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
VIDEO_SRCS_OPT+=vd_ffmpeg.c
endif
VIDEO_SRCS=dec_video.c \ VIDEO_SRCS=dec_video.c \
vd.c \ vd.c \
$(VIDEO_SRCS_NAT) \ $(VIDEO_SRCS_NAT) \
@ -94,7 +106,6 @@ VFILTER_SRCS=vf.c \
vf_flip.c \ vf_flip.c \
vf_format.c \ vf_format.c \
vf_framestep.c \ vf_framestep.c \
vf_fspp.c \
vf_halfpack.c \ vf_halfpack.c \
vf_harddup.c \ vf_harddup.c \
vf_hqdn3d.c \ vf_hqdn3d.c \
@ -103,8 +114,6 @@ VFILTER_SRCS=vf.c \
vf_ilpack.c \ vf_ilpack.c \
vf_ivtc.c \ vf_ivtc.c \
vf_kerndeint.c \ vf_kerndeint.c \
vf_lavc.c \
vf_lavcdeint.c \
vf_mirror.c \ vf_mirror.c \
vf_noformat.c \ vf_noformat.c \
vf_noise.c \ vf_noise.c \
@ -113,7 +122,6 @@ VFILTER_SRCS=vf.c \
vf_phase.c \ vf_phase.c \
vf_pp7.c \ vf_pp7.c \
vf_pullup.c \ vf_pullup.c \
vf_qp.c \
vf_rectangle.c \ vf_rectangle.c \
vf_remove_logo.c \ vf_remove_logo.c \
vf_rgb2bgr.c \ vf_rgb2bgr.c \
@ -124,7 +132,6 @@ VFILTER_SRCS=vf.c \
vf_smartblur.c \ vf_smartblur.c \
vf_softpulldown.c \ vf_softpulldown.c \
vf_softskip.c \ vf_softskip.c \
vf_spp.c \
vf_swapuv.c \ vf_swapuv.c \
vf_telecine.c \ vf_telecine.c \
vf_test.c \ vf_test.c \
@ -132,13 +139,19 @@ VFILTER_SRCS=vf.c \
vf_tile.c \ vf_tile.c \
vf_tinterlace.c \ vf_tinterlace.c \
vf_unsharp.c \ vf_unsharp.c \
vf_uspp.c \
vf_vo.c \ vf_vo.c \
vf_yuvcsp.c \ vf_yuvcsp.c \
vf_yuy2.c \ vf_yuy2.c \
vf_yvu9.c \ vf_yvu9.c \
vf_screenshot.c \ vf_screenshot.c \
VFILTER_LAVC_SRCS += vf_uspp.c \
vf_fspp.c \
vf_lavc.c \
vf_lavcdeint.c \
vf_qp.c \
vf_spp.c \
ifeq ($(CONFIG_LIBPOSTPROC),yes) ifeq ($(CONFIG_LIBPOSTPROC),yes)
VFILTER_SRCS += vf_pp.c VFILTER_SRCS += vf_pp.c
endif endif
@ -146,20 +159,36 @@ ifeq ($(CONFIG_LIBPOSTPROC_SO),yes)
VFILTER_SRCS += vf_pp.c VFILTER_SRCS += vf_pp.c
endif endif
ifeq ($(CONFIG_LIBAVCODEC),yes)
VFILTER_SRCS += $(VFILTER_LAVC_SRCS)
endif
ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
VFILTER_SRCS += $(VFILTER_LAVC_SRCS)
endif
ENCODER_SRCS=ae.c \ ENCODER_SRCS=ae.c \
ae_pcm.c \ ae_pcm.c \
ve.c \ ve.c \
ve_divx4.c \ ve_divx4.c \
ve_lavc.c \
ve_libdv.c \ ve_libdv.c \
ve_nuv.c \ ve_nuv.c \
ve_qtvideo.c \ ve_qtvideo.c \
ve_raw.c \ ve_raw.c \
ve_vfw.c \ ve_vfw.c \
ve_x264.c \
ve_xvid4.c \ ve_xvid4.c \
ve_xvid.c \ ve_xvid.c \
ifeq ($(CONFIG_LIBAVCODEC),yes)
ENCODER_SRCS+=ve_lavc.c
endif
ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
ENCODER_SRCS+=ve_lavc.c
endif
ifeq ($(X264),yes)
ENCODER_SRCS+=ve_x264.c
endif
NATIVE_SRCS=native/minilzo.c \ NATIVE_SRCS=native/minilzo.c \
native/nuppelvideo.c \ native/nuppelvideo.c \
native/RTjpegN.c \ native/RTjpegN.c \
@ -202,7 +231,6 @@ ifeq ($(CONFIG_LIBAVCODEC),yes)
LIBAV_INC += -I../libavcodec LIBAV_INC += -I../libavcodec
ENCODER_SRCS += ae_lavc.c ENCODER_SRCS += ae_lavc.c
endif endif
ifeq ($(CONFIG_LIBAVCODEC_SO),yes) ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
ENCODER_SRCS += ae_lavc.c ENCODER_SRCS += ae_lavc.c
endif endif

6
libmpcodecs/ad_ffmpeg.c
View File

@ -6,8 +6,6 @@
#include "mp_msg.h" #include "mp_msg.h"
#include "help_mp.h" #include "help_mp.h"
#ifdef USE_LIBAVCODEC
#include "ad_internal.h" #include "ad_internal.h"
#include "bswap.h" #include "bswap.h"
@ -166,7 +164,3 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
} }
return len; return len;
} }
#endif

4
libmpcodecs/vd_ffmpeg.c
View File

@ -7,8 +7,6 @@
#include "mp_msg.h" #include "mp_msg.h"
#include "help_mp.h" #include "help_mp.h"
#ifdef USE_LIBAVCODEC
#include "bswap.h" #include "bswap.h"
#include "vd_internal.h" #include "vd_internal.h"
@ -1121,5 +1119,3 @@ uint8_t *source[3]= {src->data[0], src->data[1], src->data[2]};
} }
#endif // HAVE_XVMC #endif // HAVE_XVMC
#endif

3
libmpcodecs/ve_lavc.c
View File

@ -11,8 +11,6 @@
#include "config.h" #include "config.h"
#ifdef USE_LIBAVCODEC
#include "mp_msg.h" #include "mp_msg.h"
#include "help_mp.h" #include "help_mp.h"
@ -1089,4 +1087,3 @@ vf_info_t ve_info_lavc = {
}; };
//===========================================================================// //===========================================================================//
#endif

3
libmpcodecs/ve_x264.c
View File

@ -33,8 +33,6 @@
#include "config.h" #include "config.h"
#include "mp_msg.h" #include "mp_msg.h"
#ifdef HAVE_X264
#include "m_option.h" #include "m_option.h"
#include "codec-cfg.h" #include "codec-cfg.h"
#include "stream.h" #include "stream.h"
@ -553,4 +551,3 @@ vf_info_t ve_info_x264 = {
"(C) 2004 LINUX4MEDIA GmbH; (C) 2004 Ark Linux", "(C) 2004 LINUX4MEDIA GmbH; (C) 2004 Ark Linux",
vf_open vf_open
}; };
#endif

4
libmpcodecs/vf_fspp.c
View File

@ -38,8 +38,6 @@
#include "config.h" #include "config.h"
#ifdef USE_LIBAVCODEC
#include "mp_msg.h" #include "mp_msg.h"
#include "cpudetect.h" #include "cpudetect.h"
@ -2129,5 +2127,3 @@ static void row_fdct_mmx(DCTELEM *data, const uint8_t *pixels, int line_size,
} }
#endif // HAVE_MMX #endif // HAVE_MMX
#endif //USE_LIBAVCODEC

3
libmpcodecs/vf_lavc.c
View File

@ -7,8 +7,6 @@
#include "mp_msg.h" #include "mp_msg.h"
#include "help_mp.h" #include "help_mp.h"
#ifdef USE_LIBAVCODEC
#include "img_format.h" #include "img_format.h"
#include "mp_image.h" #include "mp_image.h"
#include "vf.h" #include "vf.h"
@ -230,4 +228,3 @@ vf_info_t vf_info_lavc = {
}; };
//===========================================================================// //===========================================================================//
#endif

5
libmpcodecs/vf_lavcdeint.c
View File

@ -7,8 +7,6 @@
#include "mp_msg.h" #include "mp_msg.h"
#include "help_mp.h" #include "help_mp.h"
#ifdef USE_LIBAVCODEC
#include "img_format.h" #include "img_format.h"
#include "mp_image.h" #include "mp_image.h"
#include "vf.h" #include "vf.h"
@ -189,6 +187,3 @@ vf_info_t vf_info_lavcdeint = {
//===========================================================================// //===========================================================================//
#endif /* USE_LIBAVCODEC */

4
libmpcodecs/vf_qp.c
View File

@ -24,8 +24,6 @@
#include "config.h" #include "config.h"
#ifdef USE_LIBAVCODEC
#include "mp_msg.h" #include "mp_msg.h"
#include "cpudetect.h" #include "cpudetect.h"
@ -196,5 +194,3 @@ vf_info_t vf_info_qp = {
open, open,
NULL NULL
}; };
#endif //USE_LIBAVCODEC

4
libmpcodecs/vf_spp.c
View File

@ -32,8 +32,6 @@
#include "config.h" #include "config.h"
#ifdef USE_LIBAVCODEC
#include "mp_msg.h" #include "mp_msg.h"
#include "cpudetect.h" #include "cpudetect.h"
@ -629,5 +627,3 @@ vf_info_t vf_info_spp = {
open, open,
NULL NULL
}; };
#endif //USE_LIBAVCODEC

4
libmpcodecs/vf_uspp.c
View File

@ -24,8 +24,6 @@
#include "config.h" #include "config.h"
#ifdef USE_LIBAVCODEC
#include "mp_msg.h" #include "mp_msg.h"
#include "cpudetect.h" #include "cpudetect.h"
@ -408,5 +406,3 @@ vf_info_t vf_info_uspp = {
open, open,
NULL NULL
}; };
#endif //USE_LIBAVCODEC