diff options
| author | Roberto Togni <r_togni@tiscali.it> | 2004-12-29 23:17:42 +0000 |
|---|---|---|
| committer | Roberto Togni <r_togni@tiscali.it> | 2004-12-29 23:17:42 +0000 |
| commit | 4d4bb927ce9f0380ddb2f1936c2e937eadeabea0 (patch) | |
| tree | a7dab1382d877bfc508d602f0a41b4b68acd37e4 /libavformat | |
| parent | f50f817566a5ef97995bb5de2f88e3fb0387c130 (diff) | |
| download | ffmpeg-4d4bb927ce9f0380ddb2f1936c2e937eadeabea0.tar.gz | |
Fix compilation when both amr_nb and amr_wb are enabled
Originally committed as revision 3782 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index e54bcc2209..8147c95bee 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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 |