comparison Makefile @ 9930:32e856bd5ded libavcodec

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.
author diego
date Tue, 07 Jul 2009 09:33:08 +0000
parents 354e23134dfc
children 9711cba197fc
comparison
equal deleted inserted replaced
9929:354e23134dfc 9930:32e856bd5ded
382 OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o 382 OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o
383 383
384 # external codec libraries 384 # external codec libraries
385 OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o 385 OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o
386 OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o 386 OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o
387 OBJS-$(CONFIG_LIBFAAC) += libfaac.o 387 OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o
388 OBJS-$(CONFIG_LIBFAAD) += libfaad.o 388 OBJS-$(CONFIG_LIBFAAD_DECODER) += libfaad.o
389 OBJS-$(CONFIG_LIBGSM) += libgsm.o 389 OBJS-$(CONFIG_LIBGSM_DECODER) += libgsm.o
390 OBJS-$(CONFIG_LIBMP3LAME) += libmp3lame.o 390 OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsm.o
391 OBJS-$(CONFIG_LIBOPENCORE_AMRNB) += libopencore-amr.o 391 OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsm.o
392 OBJS-$(CONFIG_LIBOPENCORE_AMRWB) += libopencore-amr.o 392 OBJS-$(CONFIG_LIBGSM_MS_ENCODER) += libgsm.o
393 OBJS-$(CONFIG_LIBOPENJPEG) += libopenjpeg.o 393 OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o
394 OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o
395 OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o
396 OBJS-$(CONFIG_LIBOPENCORE_AMRWB_ENCODER) += libopencore-amr.o
397 OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpeg.o
394 OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o libschroedinger.o libdirac_libschro.o 398 OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o libschroedinger.o libdirac_libschro.o
395 OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.o libschroedinger.o libdirac_libschro.o 399 OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.o libschroedinger.o libdirac_libschro.o
396 OBJS-$(CONFIG_LIBSPEEX) += libspeexdec.o 400 OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o
397 OBJS-$(CONFIG_LIBTHEORA) += libtheoraenc.o 401 OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
398 OBJS-$(CONFIG_LIBVORBIS) += libvorbis.o 402 OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbis.o
399 OBJS-$(CONFIG_LIBX264) += libx264.o 403 OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o
400 OBJS-$(CONFIG_LIBXVID) += libxvidff.o libxvid_rc.o 404 OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvidff.o libxvid_rc.o
401 405
402 # parsers 406 # parsers
403 OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o mpeg4audio.o 407 OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o mpeg4audio.o
404 OBJS-$(CONFIG_AC3_PARSER) += ac3_parser.o ac3tab.o aac_ac3_parser.o 408 OBJS-$(CONFIG_AC3_PARSER) += ac3_parser.o ac3tab.o aac_ac3_parser.o
405 OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o 409 OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o