ffmpeg-system-amr.patch

   1 --- ffmpeg-export-2006-12-04/configure.orig     2006-12-09 16:02:48.392192000 +0100
   2 +++ ffmpeg-export-2006-12-04/configure  2006-12-09 17:22:37.765123062 +0100
   3 @@ -1891,6 +1891,17 @@
   4  lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`
   5
   6
   7 +if test "$amr_wb" = "yes" ; then
   8 +  extralibs="$extralibs -lamrwb"
   9 +fi
  10 +
  11 +if test "$amr_nb" = "yes" ; then
  12 +if test "$amr_nb_fixed" = "yes" ; then
  13 +  extralibs="$extralibs -lamrnbfixed"
  14 +else
  15 +  extralibs="$extralibs -lamrnb"
  16 +fi
  17 +fi
  18
  19  if test "$lshared" = "yes" ; then
  20    echo "#define BUILD_SHARED_AV 1" >> $TMPH
  21 --- ffmpeg-export-2006-12-04/libavcodec/Makefile.orig   2006-11-22 10:20:16.000000000 +0100
  22 +++ ffmpeg-export-2006-12-04/libavcodec/Makefile        2006-12-09 17:23:09.810949249 +0100
  23 @@ -264,33 +264,6 @@
  24  OBJS-$(CONFIG_DTS)                     += dtsdec.o
  25
  26  OBJS-$(CONFIG_AMR)                     += amr.o
  27 -OBJS-$(CONFIG_AMR_NB)                  += amr_float/sp_dec.o     \
  28 -                                          amr_float/sp_enc.o     \
  29 -                                          amr_float/interf_dec.o \
  30 -                                          amr_float/interf_enc.o
  31 -
  32 -ifeq ($(CONFIG_AMR_NB_FIXED),yes)
  33 -EXTRAOBJS += amr/*.o
  34 -EXTRADEPS=amrlibs
  35 -endif
  36 -
  37 -OBJS-$(CONFIG_AMR_WB)                  += amrwb_float/dec_acelp.o \
  38 -                                          amrwb_float/dec_dtx.o   \
  39 -                                          amrwb_float/dec_gain.o  \
  40 -                                          amrwb_float/dec_if.o    \
  41 -                                          amrwb_float/dec_lpc.o   \
  42 -                                          amrwb_float/dec_main.o  \
  43 -                                          amrwb_float/dec_rom.o   \
  44 -                                          amrwb_float/dec_util.o  \
  45 -                                          amrwb_float/enc_acelp.o \
  46 -                                          amrwb_float/enc_dtx.o   \
  47 -                                          amrwb_float/enc_gain.o  \
  48 -                                          amrwb_float/enc_if.o    \
  49 -                                          amrwb_float/enc_lpc.o   \
  50 -                                          amrwb_float/enc_main.o  \
  51 -                                          amrwb_float/enc_rom.o   \
  52 -                                          amrwb_float/enc_util.o  \
  53 -                                          amrwb_float/if_rom.o
  54
  55  OBJS-$(CONFIG_AAC_PARSER)              += parser.o
  56  OBJS-$(CONFIG_AC3_PARSER)              += parser.o
  57 --- ffmpeg-export-2006-12-04/libavcodec/amr.c.orig      2006-11-20 21:41:31.000000000 +0100
  58 +++ ffmpeg-export-2006-12-04/libavcodec/amr.c   2006-12-09 17:24:13.690589543 +0100
  59 @@ -61,16 +61,16 @@
  60
  61  #define MMS_IO
  62
  63 -#include "amr/sp_dec.h"
  64 -#include "amr/d_homing.h"
  65 -#include "amr/typedef.h"
  66 -#include "amr/sp_enc.h"
  67 -#include "amr/sid_sync.h"
  68 -#include "amr/e_homing.h"
  69 +#include <amr/sp_dec.h>
  70 +#include <amr/d_homing.h>
  71 +#include <amr/typedef.h>
  72 +#include <amr/sp_enc.h>
  73 +#include <amr/sid_sync.h>
  74 +#include <amr/e_homing.h>
  75
  76  #else
  77 -#include "amr_float/interf_dec.h"
  78 -#include "amr_float/interf_enc.h"
  79 +#include <amrnb/interf_dec.h>
  80 +#include <amrnb/interf_enc.h>
  81  #endif
  82
  83  /* Common code for fixed and float version*/
  84 @@ -532,8 +532,8 @@
  85  #define typedef_h
  86  #endif
  87
  88 -#include "amrwb_float/enc_if.h"
  89 -#include "amrwb_float/dec_if.h"
  90 +#include <amrwb/enc_if.h>
  91 +#include <amrwb/dec_if.h>
  92
  93  /* Common code for fixed and float version*/
  94  typedef struct AMRWB_bitrates