diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-04-25 19:12:04 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-04-25 19:12:04 +0000 |
| commit | 73508bc6d30b397f33fa7f88089a4d2298aa5ea2 (patch) | |
| tree | 2f1f01ff6da165767007b5f88f29dde4dacb706a /libavcodec | |
| parent | 8d27c5f891ad4b7f507f88489b9a987b824f88d8 (diff) | |
| download | ffmpeg-73508bc6d30b397f33fa7f88089a4d2298aa5ea2.tar.gz | |
Remove hackish support for the non-free fixed-point AMR-NB reference code.
Originally committed as revision 8813 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 664033dec4..6b1462ecb3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -271,10 +271,6 @@ OBJS-$(CONFIG_X264) += x264.o OBJS-$(CONFIG_XVID) += xvidff.o xvid_rc.o OBJS-$(CONFIG_AMR) += amr.o -ifeq ($(CONFIG_AMR_NB_FIXED),yes) -EXTRAOBJS += amr/*.o -EXTRADEPS=amrlibs -endif OBJS-$(CONFIG_AAC_PARSER) += parser.o @@ -397,9 +393,6 @@ endif include ../common.mak -amrlibs: - $(MAKE) -C amr spclib fipoplib - tests: apiexample $(TESTS) clean:: @@ -413,7 +406,6 @@ clean:: sh4/*.o sh4/*~ \ sparc/*.o sparc/*~ \ apiexample $(TESTS) - -$(MAKE) -C amr clean apiexample: apiexample.o $(LIB) @@ -429,4 +421,4 @@ motion-test: motion_test.o $(LIB) fft-test: fft-test.o $(LIB) -.PHONY: amrlibs tests +.PHONY: tests |