diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-04-27 02:23:42 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-04-27 02:23:42 +0000 |
| commit | e0fb7e5b0d600657f0ba7be2df67322a7408a45d (patch) | |
| tree | aa8105dec8992396e582847b911657c94bfd1096 /libavcodec | |
| parent | 90d9a1ba70ebfa207d0d6bb742d18d876dbe4b16 (diff) | |
cosmetics: Group all AMR variables together, add some newlines.
Originally committed as revision 5319 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index de622a2a57..edde55a1a4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -234,7 +234,9 @@ ifeq ($(CONFIG_ZMBV_DECODER),yes) OBJS+= zmbv.o endif + AMROBJS= + ifeq ($(AMR_NB),yes) ifeq ($(AMR_NB_FIXED),yes) AMROBJS= amr.o @@ -248,6 +250,20 @@ CLEANAMR=cleanamrfloat 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) OBJS+= pthread.o endif @@ -265,17 +281,6 @@ ifeq ($(HAVE_BEOSTHREADS),yes) OBJS+= beosthread.o 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= ifeq ($(HAVE_XVMC_ACCEL),yes) |