diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-26 21:55:40 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-26 21:55:40 +0000 |
commit | 45d5e76615a98a37ca6c01a41c36a86d5cd029f6 (patch) | |
tree | 472e8ddcefe162dff7d6eb80363f6f7ac0335307 /libmpcodecs | |
parent | 5442528a6ac2dfb7b476f03f772793f807ac754d (diff) |
Reorder entries for better readability.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21286 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/Makefile | 70 |
1 files changed, 30 insertions, 40 deletions
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index 3f4b1b4a64..668a43be6c 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -59,6 +59,12 @@ endif ifeq ($(LIBVORBIS),yes) AUDIO_SRCS+=ad_libvorbis.c endif +ifeq ($(MUSEPACK),yes) +AUDIO_SRCS += ad_mpc.c +endif +ifeq ($(SPEEX),yes) +AUDIO_SRCS += ad_speex.c +endif VIDEO_SRCS_LIB=vd_lzo.c \ @@ -110,6 +116,12 @@ endif ifeq ($(ZORAN),yes) VIDEO_SRCS+=vd_zrmjpeg.c endif +ifeq ($(PNG),yes) +VIDEO_SRCS += vd_mpng.c +endif +ifeq ($(JPEG),yes) +VIDEO_SRCS += vd_ijpg.c +endif VFILTER_SRCS=vf.c \ @@ -194,7 +206,6 @@ endif ifeq ($(CONFIG_LIBPOSTPROC_SO),yes) VFILTER_SRCS += vf_pp.c endif - ifeq ($(CONFIG_LIBAVCODEC),yes) VFILTER_SRCS += $(VFILTER_LAVC_SRCS) VFILTER_SRCS += $(VFILTER_LAVC_DSPUTIL_SRCS) @@ -202,10 +213,15 @@ endif ifeq ($(CONFIG_LIBAVCODEC_SO),yes) VFILTER_SRCS += $(VFILTER_LAVC_SRCS) endif - ifeq ($(PNG),yes) VFILTER_SRCS += vf_screenshot.c endif +ifeq ($(ZORAN),yes) +VFILTER_SRCS += vf_zrmjpeg.c +endif +ifeq ($(CONFIG_ASS),yes) +VFILTER_SRCS += vf_ass.c +endif ENCODER_SRCS=ae.c \ @@ -235,63 +251,37 @@ endif ifeq ($(X264),yes) ENCODER_SRCS+=ve_x264.c endif - - -NATIVE_SRCS=native/minilzo.c \ - native/nuppelvideo.c \ - native/RTjpegN.c \ - native/xa_gsm.c \ - -ifeq ($(ZORAN),yes) -VFILTER_SRCS += vf_zrmjpeg.c -endif - -ifeq ($(PNG),yes) -VIDEO_SRCS += vd_mpng.c -endif - -ifeq ($(JPEG),yes) -VIDEO_SRCS += vd_ijpg.c -endif - ifeq ($(TOOLAME),yes) ENCODER_SRCS += ae_toolame.c endif - ifeq ($(TWOLAME),yes) ENCODER_SRCS += ae_twolame.c endif - ifeq ($(MP3LAME),yes) ENCODER_SRCS += ae_lame.c endif - -ifeq ($(CONFIG_LIBAVUTIL),yes) -LIBAV_INC += -I../libavutil +ifeq ($(FAAC),yes) +ENCODER_SRCS += ae_faac.c endif -ifeq ($(CONFIG_LIBAVCODEC),yes) -LIBAV_INC += -I../libavcodec +ifeq ($(CONFIG_LIBAVCODEC_SO),yes) ENCODER_SRCS += ae_lavc.c endif -ifeq ($(CONFIG_LIBAVCODEC_SO),yes) +ifeq ($(CONFIG_LIBAVCODEC),yes) ENCODER_SRCS += ae_lavc.c endif -ifeq ($(MUSEPACK),yes) -AUDIO_SRCS += ad_mpc.c +ifeq ($(CONFIG_LIBAVUTIL),yes) +LIBAV_INC += -I../libavutil endif - -ifeq ($(SPEEX),yes) -AUDIO_SRCS += ad_speex.c +ifeq ($(CONFIG_LIBAVCODEC),yes) +LIBAV_INC += -I../libavcodec endif -ifeq ($(FAAC),yes) -ENCODER_SRCS += ae_faac.c -endif -ifeq ($(CONFIG_ASS),yes) -VFILTER_SRCS += vf_ass.c -endif +NATIVE_SRCS=native/minilzo.c \ + native/nuppelvideo.c \ + native/RTjpegN.c \ + native/xa_gsm.c \ SRCS=$(AUDIO_SRCS) \ $(VIDEO_SRCS) \ |