[Ffmpeg-cvslog] r8813 - in trunk: configure doc/ffmpeg-doc.texi libavcodec libavcodec/Makefile

[diego]

Author: diego
Date: Wed Apr 25 21:12:04 2007
New Revision: 8813

Log:
Remove hackish support for the non-free fixed-point AMR-NB reference code.


Modified:
   trunk/configure
   trunk/doc/ffmpeg-doc.texi
   trunk/libavcodec/   (props changed)
   trunk/libavcodec/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Apr 25 21:12:04 2007
@@ -99,7 +99,6 @@ show_help(){
   echo "  --enable-xvid            enable Xvid encoding via xvidcore,"
   echo "                           native MPEG-4/Xvid encoder exists [default=no]"
   echo "  --enable-amr-nb          enable amr-nb floating point audio codec"
-  echo "  --enable-amr-nb-fixed    enable amr-nb fixed-point codec"
   echo "  --enable-amr-wb          enable amr-wb floating point audio codec"
   echo ""
   echo "Advanced options (experts only):"
@@ -557,7 +556,6 @@ CONFIG_LIST='
     demuxers
     amr
     amr_nb
-    amr_nb_fixed
     amr_wb
     audio_beos
     audio_oss
@@ -683,8 +681,8 @@ zmbv_encoder_deps="zlib"
 
 aac_decoder_deps="libfaad"
 mpeg4aac_decoder_deps="libfaad"
-amr_nb_decoder_deps_any="amr_nb amr_nb_fixed"
-amr_nb_encoder_deps_any="amr_nb amr_nb_fixed"
+amr_nb_decoder_deps="amr_nb"
+amr_nb_encoder_deps="amr_nb"
 amr_wb_decoder_deps="amr_wb"
 amr_wb_encoder_deps="amr_wb"
 dts_decoder_deps="libdts"
@@ -790,7 +788,6 @@ v4l="yes"
 
 # libraries
 amr_nb="no"
-amr_nb_fixed="no"
 amr_wb="no"
 avisynth="no"
 dc1394="no"
@@ -1579,9 +1576,7 @@ for thread in $THREADS_LIST; do
     fi
 done
 
-enabled_any amr_nb amr_nb_fixed amr_wb && enable amr
-enabled_all amr_nb amr_nb_fixed &&
-    die "Only one of amr_nb and amr_nb_fixed may be enabled."
+enabled_any amr_nb amr_wb && enable amr
 
 # these are off by default, so fail if requested and not available
 enabled amr_nb     && require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm
@@ -1860,7 +1855,6 @@ echo "x264 enabled              $x264"
 echo "XviD enabled              $xvid"
 echo "zlib enabled              $zlib"
 echo "AMR-NB float support      $amr_nb"
-echo "AMR-NB fixed support      $amr_nb_fixed"
 echo "AMR-WB float support      $amr_wb"
 if disabled gpl; then
     echo "License: LGPL"
@@ -2042,7 +2036,6 @@ if enabled source_path_used; then
          libavcodec/sparc \
          libavcodec/mlib \
          libavcodec/ppc \
-         libavcodec/amr \
          libpostproc \
          libavutil \
          libswscale \

Modified: trunk/doc/ffmpeg-doc.texi
==============================================================================
--- trunk/doc/ffmpeg-doc.texi	(original)
+++ trunk/doc/ffmpeg-doc.texi	Wed Apr 25 21:12:04 2007
@@ -844,25 +844,12 @@ explicitly requested by passing the appr
 @section AMR
 
 AMR comes in two different flavors, WB and NB. FFmpeg can make use of the
-AMR WB (floating-point mode) and the AMR NB (both floating-point and
-fixed-point mode) reference decoders and encoders.
-
- at itemize
-
- at item For AMR WB floating-point and AMR NB floating point support, go to
- at url{http://www.penguin.cz/~utx/amr} and follow the instructions for building
-the libraries. Pass @code{--enable-amr-nb} and/or @code{--enable-amr-wb} to
-configure to enable the libraries.
-
- at item For AMR NB fixed-point download TS26.073 REL-6 V6.0.0 from
- at url{http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-600.zip}
-and extract the source to the directory @file{libavcodec/amr}.
-You must also add @code{-DMMS_IO} to @code{CFLAGS} in
- at file{libavcodec/amr/makefile}, i.e.
-``@code{CFLAGS = -Wall -pedantic-errors -I. $(CFLAGS_$(MODE)) -D$(VAD) -DMMS_IO}''.
-Pass @code{--enable-amr-nb-fixed} to configure to enable it.
+AMR WB (floating-point mode) and the AMR NB (floating-point mode) reference
+decoders and encoders.
 
- at end itemize
+Go to @url{http://www.penguin.cz/~utx/amr} and follow the instructions for
+installing the libraries. Then pass @code{--enable-amr-nb} and/or
+ at code{--enable-amr-wb} to configure to enable the libraries.
 
 
 @chapter Supported File Formats and Codecs

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Wed Apr 25 21:12:04 2007
@@ -271,10 +271,6 @@ OBJS-$(CONFIG_X264)                    +
 OBJS-$(CONFIG_XVID)                    += xvidff.o xvid_rc.o
 
 OBJS-$(CONFIG_AMR)                     += amr.o
-ifeq ($(CONFIG_AMR_NB_FIXED),yes)
-EXTRAOBJS += amr/*.o
-EXTRADEPS=amrlibs
-endif
 
 
 OBJS-$(CONFIG_AAC_PARSER)              += parser.o
@@ -397,9 +393,6 @@ endif
 
 include ../common.mak
 
-amrlibs:
-	$(MAKE) -C amr spclib fipoplib
-
 tests: apiexample $(TESTS)
 
 clean::
@@ -413,7 +406,6 @@ clean::
 	   sh4/*.o sh4/*~ \
 	   sparc/*.o sparc/*~ \
 	   apiexample $(TESTS)
-	-$(MAKE) -C amr clean
 
 apiexample: apiexample.o $(LIB)
 
@@ -429,4 +421,4 @@ motion-test: motion_test.o $(LIB)
 
 fft-test: fft-test.o $(LIB)
 
-.PHONY: amrlibs tests
+.PHONY: tests