git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further simplify AMR build.
[ffmpeg.git]
/
libavformat
/
Makefile
diff --git
a/libavformat/Makefile
b/libavformat/Makefile
index
e5e7efa
..
c164016
100644
(file)
--- a/
libavformat/Makefile
+++ b/
libavformat/Makefile
@@
-26,17
+26,9
@@
OBJS+= flvenc.o movenc.o asf-enc.o adtsenc.o
endif
endif
-AMROBJS=
-ifeq ($(AMR_NB),yes)
-AMROBJS= amr.o
+ifeq ($(AMR),yes)
+OBJS+= amr.o
endif
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
# image formats
OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o