gpac-amr.patch

   1 --- gpac/modules/amr_float_dec/Makefile.orig    2011-04-21 17:06:51.000000000 +0200
   2 +++ gpac/modules/amr_float_dec/Makefile 2012-06-15 19:19:05.988610730 +0200
   3 @@ -18,19 +18,19 @@
   4  #common obj
   5  OBJS=../amr_dec/amr_in.o amr_float_dec.o
   6
   7 +AMR_LIBS=
   8 +
   9  #AMR NB obj
  10  CFLAGS+=-DGPAC_HAS_AMR_FT
  11  ifeq ($(CONFIG_AMR_NB_FT), yes)
  12 -OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
  13 +AMR_LIBS+=-lamrnb
  14  endif
  15
  16
  17  #AMR WB obj
  18  CFLAGS+=-DGPAC_HAS_AMR_FT_WB
  19  ifeq ($(CONFIG_AMR_WB_FT), yes)
  20 -OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
  21 -       ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
  22 -       ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o
  23 +AMR_LIBS+=-lamrwb
  24  endif
  25
  26
  27 @@ -45,7 +45,7 @@
  28
  29
  30  $(LIB): $(OBJS)
  31 -       $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
  32 +       $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(AMR_LIBS)
  33
  34
  35  %.o: %.c
  36 --- gpac/modules/amr_float_dec/amr_float_dec.c.orig     2012-03-28 14:43:41.000000000 +0200
  37 +++ gpac/modules/amr_float_dec/amr_float_dec.c  2012-06-15 19:20:41.675273381 +0200
  38 @@ -45,12 +45,12 @@
  39
  40  #ifdef GPAC_HAS_AMR_FT
  41  /*AMR WB*/
  42 -#include "amr_nb_ft/interf_dec.h"
  43 +#include "amrnb/interf_dec.h"
  44  #endif
  45
  46  #ifdef GPAC_HAS_AMR_FT_WB
  47  /*AMR WB*/
  48 -#include "amr_wb_ft/dec_if.h"
  49 +#include "amrwb/dec_if.h"
  50  #endif
  51
  52  #endif