[SCM] libav/experimental: cosmetics: Group all AMR variables together, add some newlines.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e0fb7e5b0d600657f0ba7be2df67322a7408a45d
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Apr 27 02:23:42 2006 +0000

    cosmetics: Group all AMR variables together, add some newlines.
    
    Originally committed as revision 5319 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index de622a2..edde55a 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)

-- 
Libav/FFmpeg packaging