1 --- ffmpeg/configure.orig 2006-07-02 00:58:55.381979000 +0200
2 +++ ffmpeg/configure 2006-07-02 12:45:52.840905000 +0200
4 echo "#define HAVE_VHOOK 1" >> $TMPH
7 +if test "$amr_wb" = "yes" ; then
8 + echo "#define AMR_WB 1" >> $TMPH
9 + echo "AMR_WB=yes" >> config.mak
10 + extralibs="$extralibs -lamrwb"
13 +if test "$amr_nb" = "yes" ; then
14 + echo "#define AMR_NB 1" >> $TMPH
15 + echo "AMR_NB=yes" >> config.mak
16 +if test "$amr_nb_fixed" = "yes" ; then
17 + extralibs="$extralibs -lamrnbfixed"
19 + extralibs="$extralibs -lamrnb"
21 +if test "$amr_if2" = "yes" ; then
22 + echo "AMR_CFLAGS=-DIF2=1" >> config.mak
26 pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libavcodec/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
27 lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'`
28 lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'`
29 @@ -1817,46 +1836,6 @@
30 echo "SRC_PATH='$source_path'" >> config.mak
33 -if test "$amr_wb" = "yes" ; then
34 - echo "#define AMR_WB 1" >> $TMPH
35 - echo "AMR_WB=yes" >> config.mak
37 - echo "AMR WB FLOAT NOTICE ! Make sure you have downloaded TS26.204"
39 - echo "http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip"
40 - echo "and extracted the source to libavcodec/amrwb_float"
44 -if test "$amr_nb" = "yes" ; then
45 - echo "#define AMR_NB 1" >> $TMPH
46 - echo "AMR_NB=yes" >> config.mak
48 -if test "$amr_nb_fixed" = "yes" ; then
49 - echo "AMR_NB_FIXED=yes" >> config.mak
50 - echo "#define AMR_NB_FIXED 1" >> $TMPH
51 - echo "AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 "
52 - echo "REL-5 version 5.1.0 from "
53 - echo "http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-5??.zip"
54 - echo "and extracted src to libavcodec/amr"
55 - echo "You must also add -DMMS_IO and remove -pedantic-errors to/from CFLAGS in libavcodec/amr/makefile."
56 - echo "i.e. CFLAGS = -Wall -I. \$(CFLAGS_\$(MODE)) -D\$(VAD) -DMMS_IO"
59 - echo "AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104"
60 - echo "REL-5 V5.1.0 from "
61 - echo "http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-5??.zip"
62 - echo "and extracted the source to libavcodec/amr_float"
63 - echo "and if u try this on an alpha, u may need to change Word32 to int in amr/typedef.h"
67 -if test "$amr_if2" = "yes" ; then
68 - echo "AMR_CFLAGS=-DIF2=1" >> config.mak
73 for codec in $CODEC_LIST ; do
74 echo "#define CONFIG_`echo $codec | tr a-z A-Z` 1" >> $TMPH
75 echo "CONFIG_`echo $codec | tr a-z A-Z`=yes" >> config.mak
76 --- ffmpeg/libavcodec/Makefile.orig 2006-07-02 00:58:55.361978000 +0200
77 +++ ffmpeg/libavcodec/Makefile 2006-07-02 12:36:11.820593500 +0200
80 ifeq ($(AMR_NB_FIXED),yes)
82 -AMREXTRALIBS+= amr/*.lo
87 -OBJS+= amr_float/sp_dec.lo amr_float/sp_enc.lo amr_float/interf_dec.lo amr_float/interf_enc.lo
88 -CLEANAMR=cleanamrfloat
96 -OBJS+= amrwb_float/dec_acelp.lo amrwb_float/dec_dtx.lo amrwb_float/dec_gain.lo \
97 - amrwb_float/dec_if.lo amrwb_float/dec_lpc.lo amrwb_float/dec_main.lo \
98 - amrwb_float/dec_rom.lo amrwb_float/dec_util.lo amrwb_float/enc_acelp.lo \
99 - amrwb_float/enc_dtx.lo amrwb_float/enc_gain.lo amrwb_float/enc_if.lo \
100 - amrwb_float/enc_lpc.lo amrwb_float/enc_main.lo amrwb_float/enc_rom.lo \
101 - amrwb_float/enc_util.lo amrwb_float/if_rom.lo
104 -CLEANAMRWB=cleanamrwbfloat
107 ifeq ($(HAVE_XVMC_ACCEL),yes)
113 - $(MAKE) -C amr spclib fipoplib
115 tests: apiexample cpuid_test $(TESTS)
117 $(LIB): $(OBJS) $(AMRLIBS) $(EXTRADEPS)
120 $(MAKE) -C libpostproc distclean
123 - $(MAKE) -C amr clean
126 - rm -f amr_float/*.o
129 - $(MAKE) -C amrwb_float -f makefile.gcc clean
131 # api example program
132 apiexample: apiexample.c $(LIB)
133 libtool --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< $(LIB) $(LIBAVUTIL) $(EXTRALIBS) -lm
134 --- ffmpeg/libavcodec/amr.c.orig 2006-01-12 23:43:14.000000000 +0100
135 +++ ffmpeg/libavcodec/amr.c 2006-07-02 12:34:29.710212000 +0200
140 -#include "amr/sp_dec.h"
141 -#include "amr/d_homing.h"
142 -#include "amr/typedef.h"
143 -#include "amr/sp_enc.h"
144 -#include "amr/sid_sync.h"
145 -#include "amr/e_homing.h"
146 +#include <amr/sp_dec.h>
147 +#include <amr/d_homing.h>
148 +#include <amr/typedef.h>
149 +#include <amr/sp_enc.h>
150 +#include <amr/sid_sync.h>
151 +#include <amr/e_homing.h>
154 -#include "amr_float/interf_dec.h"
155 -#include "amr_float/interf_enc.h"
156 +#include <amrnb/interf_dec.h>
157 +#include <amrnb/interf_enc.h>
160 /* Common code for fixed and float version*/
165 -#include "amrwb_float/enc_if.h"
166 -#include "amrwb_float/dec_if.h"
167 +#include <amrwb/enc_if.h>
168 +#include <amrwb/dec_if.h>
170 /* Common code for fixed and float version*/
171 typedef struct AMRWB_bitrates