comparison Makefile @ 9929:354e23134dfc libavcodec

Remove support for nonfree libamr library for AMR-NB/WB decoding/encoding. libopencore can now be used as a replacement except for AMR-WB encoding.
author diego
date Tue, 07 Jul 2009 00:28:16 +0000
parents 4ccec8d051fa
children 32e856bd5ded
comparison
equal deleted inserted replaced
9928:16330a3b573b 9929:354e23134dfc
380 OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o 380 OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o
381 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o 381 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o
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_LIBAMR_NB) += libamr.o
386 OBJS-$(CONFIG_LIBAMR_WB) += libamr.o
387 OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o 385 OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o
388 OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o 386 OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o
389 OBJS-$(CONFIG_LIBFAAC) += libfaac.o 387 OBJS-$(CONFIG_LIBFAAC) += libfaac.o
390 OBJS-$(CONFIG_LIBFAAD) += libfaad.o 388 OBJS-$(CONFIG_LIBFAAD) += libfaad.o
391 OBJS-$(CONFIG_LIBGSM) += libgsm.o 389 OBJS-$(CONFIG_LIBGSM) += libgsm.o