# HG changeset patch # User diego # Date 1164578140 0 # Node ID 64d299933e17e4f81519dc856313d72ab92b2bf2 # Parent 45cdeb103b6f9bc4a7216bc410188be01cd2000c Reorder entries for better readability. diff -r 45cdeb103b6f -r 64d299933e17 libmpcodecs/Makefile --- a/libmpcodecs/Makefile Sun Nov 26 21:30:17 2006 +0000 +++ b/libmpcodecs/Makefile Sun Nov 26 21:55:40 2006 +0000 @@ -59,6 +59,12 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 ($(FAAC),yes) +ENCODER_SRCS += ae_faac.c +endif +ifeq ($(CONFIG_LIBAVCODEC_SO),yes) +ENCODER_SRCS += ae_lavc.c +endif +ifeq ($(CONFIG_LIBAVCODEC),yes) +ENCODER_SRCS += ae_lavc.c +endif ifeq ($(CONFIG_LIBAVUTIL),yes) LIBAV_INC += -I../libavutil endif ifeq ($(CONFIG_LIBAVCODEC),yes) LIBAV_INC += -I../libavcodec -ENCODER_SRCS += ae_lavc.c -endif -ifeq ($(CONFIG_LIBAVCODEC_SO),yes) -ENCODER_SRCS += ae_lavc.c -endif - -ifeq ($(MUSEPACK),yes) -AUDIO_SRCS += ad_mpc.c endif -ifeq ($(SPEEX),yes) -AUDIO_SRCS += ad_speex.c -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) \