diff options
| author | joca@rixmail.se <joca@rixmail.se> | 2003-05-14 11:40:16 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-05-14 11:40:16 +0000 |
| commit | 891f64b33972bb35f64d0b7ae0928004ff278f5b (patch) | |
| tree | b60d7b79b58c97259c991b10e6fec7b43eac34c7 /Makefile | |
| parent | 17fb5fd34e96ce472019d4f2b8d798bbd885a24b (diff) | |
| download | ffmpeg-891f64b33972bb35f64d0b7ae0928004ff278f5b.tar.gz | |
AMR-NB audio support patch by (<joca at rixmail dot se>)
Originally committed as revision 1876 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 15 insertions, 2 deletions
@@ -43,6 +43,12 @@ EXTRALIBS+=-lmp3lame endif endif +ifeq ($(AMR_NB),yes) +EXTRALIBS+= libavcodec/amr/spc.a libavcodec/amr/fipop.a +AMRLIBS=amrlibs +CLEANAMR=cleanamr +endif + ifeq ($(CONFIG_VORBIS),yes) EXTRALIBS+=-logg -lvorbis -lvorbisenc endif @@ -73,10 +79,14 @@ FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec all: lib $(PROG) $(VHOOK) -lib: +lib: $(AMRLIBS) $(MAKE) -C libavcodec all $(MAKE) -C libavformat all +#make sure you have added -DMMS_IO to CFLAGS in libavcodec/amr/makefile!! +amrlibs: + $(MAKE) -C libavcodec/amr spclib fipoplib + ffmpeg_g$(EXE): ffmpeg.o .libs $(CC) $(LDFLAGS) -o $@ ffmpeg.o $(FFLIBS) $(EXTRALIBS) @@ -128,7 +138,7 @@ endif @test -f .libs || touch .libs @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done -clean: $(CLEANVHOOK) +clean: $(CLEANVHOOK) $(CLEANAMR) $(MAKE) -C libavcodec clean $(MAKE) -C libavformat clean $(MAKE) -C tests clean @@ -141,6 +151,9 @@ distclean: clean $(MAKE) -C libavcodec distclean rm -f config.mak config.h +cleanamr: + $(MAKE) -C libavcodec/amr clean + TAGS: etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch] |