Fix amr_nb-fixed build.
Originally committed as revision 5324 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
@@ -245,8 +245,8 @@ endif
|
|||||||
|
|
||||||
ifeq ($(AMR_NB_FIXED),yes)
|
ifeq ($(AMR_NB_FIXED),yes)
|
||||||
AMROBJS= amr.o
|
AMROBJS= amr.o
|
||||||
AMREXTRALIBS+= amr/*.o
|
EXTRAOBJS += amr/*.o
|
||||||
AMRLIBS=amrlibs
|
EXTRADEPS=amrlibs
|
||||||
CLEANAMR=cleanamr
|
CLEANAMR=cleanamr
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -423,12 +423,8 @@ LIBMAJOR=$(LAVCMAJOR)
|
|||||||
endif
|
endif
|
||||||
TESTS= imgresample-test dct-test motion-test fft-test
|
TESTS= imgresample-test dct-test motion-test fft-test
|
||||||
|
|
||||||
EXTRAOBJS = $(AMREXTRALIBS)
|
|
||||||
|
|
||||||
include $(SRC_PATH)/common.mak
|
include $(SRC_PATH)/common.mak
|
||||||
|
|
||||||
$(LIB): $(AMRLIBS)
|
|
||||||
|
|
||||||
amrlibs:
|
amrlibs:
|
||||||
$(MAKE) -C amr spclib fipoplib
|
$(MAKE) -C amr spclib fipoplib
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user