RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix compilation when both amr_nb and amr_wb are enabled 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/Makefile
View File

@ -23,14 +23,16 @@ OBJS= bitstream.o utils.o mem.o allcodecs.o \
flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o ulti.o h264idct.o \ flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o ulti.o h264idct.o \
qdrw.o xl.o rangecoder.o png.o pnm.o qpeg.o qdrw.o xl.o rangecoder.o png.o pnm.o qpeg.o
AMROBJS=
ifeq ($(AMR_NB),yes) ifeq ($(AMR_NB),yes)
ifeq ($(AMR_NB_FIXED),yes) ifeq ($(AMR_NB_FIXED),yes)
OBJS+= amr.o AMROBJS= amr.o
AMREXTRALIBS+= amr/*.o AMREXTRALIBS+= amr/*.o
AMRLIBS=amrlibs AMRLIBS=amrlibs
CLEANAMR=cleanamr CLEANAMR=cleanamr
else else
OBJS+= amr.o amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o AMROBJS= amr.o
OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
CLEANAMR=cleanamrfloat CLEANAMR=cleanamrfloat
endif endif
endif endif
@ -48,13 +50,15 @@ OBJS+= beosthread.o
endif endif
ifeq ($(AMR_WB),yes) ifeq ($(AMR_WB),yes)
OBJS+= amr.o amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \ AMROBJS= amr.o
OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \ amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \ amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \ amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \ amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
amrwb_float/enc_util.o amrwb_float/if_rom.o amrwb_float/enc_util.o amrwb_float/if_rom.o
endif endif
OBJS+= $(AMROBJS)
CLEANAMRWB=cleanamrwbfloat CLEANAMRWB=cleanamrwbfloat
ASM_OBJS= ASM_OBJS=

8
libavformat/Makefile
View File

@ -23,15 +23,17 @@ OBJS+= asf.o
OBJS+= asf-enc.o OBJS+= asf-enc.o
endif endif
AMROBJS=
ifeq ($(AMR_NB),yes) ifeq ($(AMR_NB),yes)
OBJS+= amr.o AMROBJS= amr.o
endif endif
ifeq ($(AMR_NB_FIXED),yes) ifeq ($(AMR_NB_FIXED),yes)
OBJS+= amr.o AMROBJS= amr.o
endif endif
ifeq ($(AMR_WB),yes) ifeq ($(AMR_WB),yes)
OBJS+= amr.o AMROBJS= amr.o
endif endif
OBJS+= $(AMROBJS)
# image formats # image formats
OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o