Mercurial > libavformat.hg

changeset 629:996fe7d78701 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation when both amr_nb and amr_wb are enabled
author rtognimp
date Wed, 29 Dec 2004 23:17:42 +0000
parents 8909a59c9461
children d2bae3719018
files Makefile
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Dec 29 18:31:28 2004 +0000
+++ b/Makefile	Wed Dec 29 23:17:42 2004 +0000
@@ -23,15 +23,17 @@
 OBJS+= asf-enc.o
 endif
 
+AMROBJS=
 ifeq ($(AMR_NB),yes)
-OBJS+= amr.o
+AMROBJS= amr.o
 endif
 ifeq ($(AMR_NB_FIXED),yes)
-OBJS+= amr.o
+AMROBJS= amr.o
 endif
 ifeq ($(AMR_WB),yes)
-OBJS+= amr.o
+AMROBJS= amr.o
 endif
+OBJS+= $(AMROBJS)
 
 # image formats
 OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o