From 0676e48e302be19732cc7169779b1e7b7de296d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Tue, 14 Nov 2006 02:07:55 +0000
Subject: [PATCH] move AMR notices next to other messages
Originally committed as revision 7036 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
configure | 54 +++++++++++++++++++++++++++---------------------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/configure b/configure
index f68994dfa19..b2fbe4065e2 100755
--- a/configure
+++ b/configure
@@ -1753,6 +1753,33 @@ else
echo "License: GPL"
fi
+if test "$amr_wb" = "yes" ; then
+ echo
+ echo "AMR WB FLOAT NOTICE ! Make sure you have downloaded TS26.204"
+ echo "V5.1.0 from "
+ echo "http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip"
+ echo "and extracted the source to libavcodec/amrwb_float"
+fi
+
+if test "$amr_nb" = "yes" ; then
+ 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/archive/26_series/26.104/26104-510.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
+ echo "AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 "
+ echo "REL-5 version 5.1.0 from "
+ echo "http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-510.zip"
+ 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"
+fi
+
echo "Creating config.mak and config.h..."
date >> config.log
@@ -2043,33 +2070,6 @@ echo "SRC_PATH=\"$source_path\"" >> config.mak
echo "SRC_PATH_BARE=$source_path" >> config.mak
echo "BUILD_ROOT=\"$PWD\"" >> config.mak
-if test "$amr_wb" = "yes" ; then
- echo
- echo "AMR WB FLOAT NOTICE ! Make sure you have downloaded TS26.204"
- echo "V5.1.0 from "
- echo "http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip"
- echo "and extracted the source to libavcodec/amrwb_float"
-fi
-
-if test "$amr_nb" = "yes" ; then
- 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/archive/26_series/26.104/26104-510.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
- echo "AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 "
- echo "REL-5 version 5.1.0 from "
- echo "http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-510.zip"
- 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"
-fi
-
if test "$amr_if2" = "yes" ; then
echo "AMR_CFLAGS=-DIF2=1" >> config.mak
fi
--
GitLab