virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-06 08:29:25 +02:00
Code Issues Releases Activity

Fix compilation when both amr_nb and amr_wb are enabled

Browse Source 
Originally committed as revision 3782 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Roberto Togni
2004-12-29 23:17:42 +00:00
parent f50f817566
commit 4d4bb927ce
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/Makefile
View File

@@ -23,15 +23,17 @@ OBJS+= asf.o
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