Skip to content
Snippets Groups Projects
Commit e0fb7e5b authored by Diego Biurrun's avatar Diego Biurrun
Browse files

cosmetics: Group all AMR variables together, add some newlines.

Originally committed as revision 5319 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 90d9a1ba
No related branches found
No related tags found
No related merge requests found
...@@ -234,7 +234,9 @@ ifeq ($(CONFIG_ZMBV_DECODER),yes) ...@@ -234,7 +234,9 @@ ifeq ($(CONFIG_ZMBV_DECODER),yes)
OBJS+= zmbv.o OBJS+= zmbv.o
endif endif
AMROBJS= AMROBJS=
ifeq ($(AMR_NB),yes) ifeq ($(AMR_NB),yes)
ifeq ($(AMR_NB_FIXED),yes) ifeq ($(AMR_NB_FIXED),yes)
AMROBJS= amr.o AMROBJS= amr.o
...@@ -248,6 +250,20 @@ CLEANAMR=cleanamrfloat ...@@ -248,6 +250,20 @@ CLEANAMR=cleanamrfloat
endif endif
endif endif
ifeq ($(AMR_WB),yes)
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_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_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
amrwb_float/enc_util.o amrwb_float/if_rom.o
CLEANAMR=cleanamrwbfloat
endif
OBJS+= $(AMROBJS)
ifeq ($(HAVE_PTHREADS),yes) ifeq ($(HAVE_PTHREADS),yes)
OBJS+= pthread.o OBJS+= pthread.o
endif endif
...@@ -265,17 +281,6 @@ ifeq ($(HAVE_BEOSTHREADS),yes) ...@@ -265,17 +281,6 @@ ifeq ($(HAVE_BEOSTHREADS),yes)
OBJS+= beosthread.o OBJS+= beosthread.o
endif endif
ifeq ($(AMR_WB),yes)
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_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_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
amrwb_float/enc_util.o amrwb_float/if_rom.o
CLEANAMR=cleanamrwbfloat
endif
OBJS+= $(AMROBJS)
ASM_OBJS= ASM_OBJS=
ifeq ($(HAVE_XVMC_ACCEL),yes) ifeq ($(HAVE_XVMC_ACCEL),yes)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment