virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

Disentangle dependencies between amr_nb and amr_nb-fixed: amr_nb-fixed does

Browse Source 
work even without amr_nb.

Originally committed as revision 5321 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-04-27 02:33:27 +00:00
parent 28fff4c81b
commit 6eb07e7349
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -1927,6 +1927,13 @@ if test "$amr_nb" = "yes" ; then
echo "#define AMR_NB 1" >> $TMPH echo "#define AMR_NB 1" >> $TMPH
echo "AMR_NB=yes" >> config.mak echo "AMR_NB=yes" >> config.mak
echo 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 if test "$amr_nb_fixed" = "yes" ; then
echo "#define AMR_NB_FIXED 1" >> $TMPH echo "#define AMR_NB_FIXED 1" >> $TMPH
echo "AMR_NB_FIXED=yes" >> config.mak 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 "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 "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" 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 fi
if test "$amr_if2" = "yes" ; then if test "$amr_if2" = "yes" ; then
echo "AMR_CFLAGS=-DIF2=1" >> config.mak echo "AMR_CFLAGS=-DIF2=1" >> config.mak
fi fi
fi
for codec in $CODEC_LIST ; do for codec in $CODEC_LIST ; do
echo "#define CONFIG_`echo $codec | tr a-z A-Z` 1" >> $TMPH echo "#define CONFIG_`echo $codec | tr a-z A-Z` 1" >> $TMPH

10
libavcodec/Makefile
View File

@ -238,16 +238,16 @@ endif
AMROBJS= AMROBJS=
ifeq ($(AMR_NB),yes) 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) ifeq ($(AMR_NB_FIXED),yes)
AMROBJS= amr.o AMROBJS= amr.o
AMREXTRALIBS+= amr/*.o AMREXTRALIBS+= amr/*.o
AMRLIBS=amrlibs AMRLIBS=amrlibs
CLEANAMR=cleanamr 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 endif
ifeq ($(AMR_WB),yes) ifeq ($(AMR_WB),yes)