From 6eb07e7349cd13a66f59e82559d107e89293a954 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 27 Apr 2006 02:33:27 +0000
Subject: [PATCH] Disentangle dependencies between amr_nb and amr_nb-fixed:
amr_nb-fixed does work even without amr_nb.
Originally committed as revision 5321 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
configure | 14 +++++++-------
libavcodec/Makefile | 10 +++++-----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index 0075dd2e677..694150a3073 100755
--- a/configure
+++ b/configure
@@ -1927,6 +1927,13 @@ if test "$amr_nb" = "yes" ; then
echo "#define AMR_NB 1" >> $TMPH
echo "AMR_NB=yes" >> config.mak
echo
+ echo "AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104"
+ echo "REL-5 V5.1.0 from "
+ echo "http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-5??.zip"
+ echo "and extracted the source to libavcodec/amr_float"
+ echo "If you try this on alpha, you may need to change Word32 to int in amr/typedef.h"
+fi
+
if test "$amr_nb_fixed" = "yes" ; then
echo "#define AMR_NB_FIXED 1" >> $TMPH
echo "AMR_NB_FIXED=yes" >> config.mak
@@ -1937,19 +1944,12 @@ if test "$amr_nb_fixed" = "yes" ; then
echo "and extracted src to libavcodec/amr"
echo "You must also add -DMMS_IO and remove -pedantic-errors to/from CFLAGS in libavcodec/amr/makefile."
echo "i.e. CFLAGS = -Wall -I. \$(CFLAGS_\$(MODE)) -D\$(VAD) -DMMS_IO"
-else
- echo "AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104"
- echo "REL-5 V5.1.0 from "
- echo "http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-5??.zip"
- echo "and extracted the source to libavcodec/amr_float"
- echo "If you try this on alpha, you may need to change Word32 to int in amr/typedef.h"
fi
if test "$amr_if2" = "yes" ; then
echo "AMR_CFLAGS=-DIF2=1" >> config.mak
fi
-fi
for codec in $CODEC_LIST ; do
echo "#define CONFIG_`echo $codec | tr a-z A-Z` 1" >> $TMPH
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index edde55a1a41..6274f587eaa 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -238,16 +238,16 @@ endif
AMROBJS=
ifeq ($(AMR_NB),yes)
+AMROBJS= amr.o
+OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
+CLEANAMR=cleanamrfloat
+endif
+
ifeq ($(AMR_NB_FIXED),yes)
AMROBJS= amr.o
AMREXTRALIBS+= amr/*.o
AMRLIBS=amrlibs
CLEANAMR=cleanamr
-else
-AMROBJS= amr.o
-OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
-CLEANAMR=cleanamrfloat
-endif
endif
ifeq ($(AMR_WB),yes)
--
GitLab