diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-07-07 00:28:16 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-07-07 00:28:16 +0000 |
| commit | fc1206a4d95e24f8700eeb978a41419b7de64644 (patch) | |
| tree | e28c04431b3a20ef60d01649208dc6b101e02f63 /libavcodec/Makefile | |
| parent | df2bd71aeb3e68509e3afc5502ef7cd6e5a69583 (diff) | |
| download | ffmpeg-fc1206a4d95e24f8700eeb978a41419b7de64644.tar.gz | |
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.
Originally committed as revision 19365 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 503c5d4a3c..3c6467b328 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -382,8 +382,6 @@ OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o # external codec libraries -OBJS-$(CONFIG_LIBAMR_NB) += libamr.o -OBJS-$(CONFIG_LIBAMR_WB) += libamr.o OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o OBJS-$(CONFIG_LIBDIRAC_ENCODER) += libdiracenc.o libdirac_libschro.o OBJS-$(CONFIG_LIBFAAC) += libfaac.o |