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