summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-05-06 10:57:38 +0000
committerDiego Biurrun <diego@biurrun.de>2006-05-06 10:57:38 +0000
commit60827a1a802f0608852b1bd2184fc7d4bcd71cd4 (patch)
tree4a5d26cba910508932d9b21a0ca0bf38e845f1c9 /libavformat
parent46fe31a019364fbc0b15b78fb0dc5f5d253cf688 (diff)
Further simplify AMR build.
Originally committed as revision 5347 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/Makefile12
1 files changed, 2 insertions, 10 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index e5e7efaec6..c164016fff 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -26,17 +26,9 @@ OBJS+= flvenc.o movenc.o asf-enc.o adtsenc.o
endif
-AMROBJS=
-ifeq ($(AMR_NB),yes)
-AMROBJS= amr.o
+ifeq ($(AMR),yes)
+OBJS+= amr.o
endif
-ifeq ($(AMR_NB_FIXED),yes)
-AMROBJS= amr.o
-endif
-ifeq ($(AMR_WB),yes)
-AMROBJS= amr.o
-endif
-OBJS+= $(AMROBJS)
# image formats
OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o