# HG changeset patch # User diego # Date 1246959188 0 # Node ID 32e856bd5ded2452699808a8b4c2fcace9ef5972 # Parent 354e23134dfceb5bbbb7955edd4bf00b3017a8eb Check for CONFIG_LIBFOO_DECODER/CONFIG_LIBFOO_ENCODER instead of just CONFIG_LIBFOO in the external libraries section. This is more consistent with the rest of the Makefiles, it makes clearer what is actually implemented and should be advantageous if we implement an external library encoder where we previously just had the decoder and vice versa. diff -r 354e23134dfc -r 32e856bd5ded Makefile --- a/Makefile Tue Jul 07 00:28:16 2009 +0000 +++ b/Makefile Tue Jul 07 09:33:08 2009 +0000 @@ -384,20 +384,24 @@ # external codec libraries OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o -OBJS-$(CONFIG_LIBFAAC) += libfaac.o -OBJS-$(CONFIG_LIBFAAD) += libfaad.o -OBJS-$(CONFIG_LIBGSM) += libgsm.o -OBJS-$(CONFIG_LIBMP3LAME) += libmp3lame.o -OBJS-$(CONFIG_LIBOPENCORE_AMRNB) += libopencore-amr.o -OBJS-$(CONFIG_LIBOPENCORE_AMRWB) += libopencore-amr.o -OBJS-$(CONFIG_LIBOPENJPEG) += libopenjpeg.o +OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o +OBJS-$(CONFIG_LIBFAAD_DECODER) += libfaad.o +OBJS-$(CONFIG_LIBGSM_DECODER) += libgsm.o +OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsm.o +OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsm.o +OBJS-$(CONFIG_LIBGSM_MS_ENCODER) += libgsm.o +OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o +OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o +OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o +OBJS-$(CONFIG_LIBOPENCORE_AMRWB_ENCODER) += libopencore-amr.o +OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpeg.o OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o libschroedinger.o libdirac_libschro.o OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.o libschroedinger.o libdirac_libschro.o -OBJS-$(CONFIG_LIBSPEEX) += libspeexdec.o -OBJS-$(CONFIG_LIBTHEORA) += libtheoraenc.o -OBJS-$(CONFIG_LIBVORBIS) += libvorbis.o -OBJS-$(CONFIG_LIBX264) += libx264.o -OBJS-$(CONFIG_LIBXVID) += libxvidff.o libxvid_rc.o +OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o +OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o +OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbis.o +OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o +OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvidff.o libxvid_rc.o # parsers OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o mpeg4audio.o