Do not group libamr_nb and libamr_wb together as libamr.

Also fixes --enable-libamr being recognized as configure parameter.

Originally committed as revision 11616 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 560d27bae555c711dec4b1dfec8e259028c19305..89040cbe2b3c785d28663702e789dfead3927796 100755 (executable)
--- a/configure
+++ b/configure
@@ -634,7 +634,6 @@ CONFIG_LIST="
     ipv6
     liba52
     liba52bin
-    libamr
     libamr_nb
     libamr_wb
     libdc1394
@@ -1628,8 +1627,6 @@ int main(void) { return ($func(3.999f) > 0)?0:1; }
 EOF
 done
 
-enabled_any libamr_nb libamr_wb && enable libamr
-
 # these are off by default, so fail if requested and not available
 enabled avisynth   && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32
 enabled liba52     && require  liba52 a52dec/a52.h a52_init -la52

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 395a4a99cd657663fee51cd4780487051998e6fb..b7b1c1f5b162411d6f709a32680f8222a2b7a0f4 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -304,7 +304,8 @@ OBJS-$(CONFIG_OGG_MUXER)               += xiph.o
 
 # external codec libraries
 OBJS-$(CONFIG_LIBA52)                  += liba52.o
-OBJS-$(CONFIG_LIBAMR)                  += libamr.o
+OBJS-$(CONFIG_LIBAMR_NB)               += libamr.o
+OBJS-$(CONFIG_LIBAMR_WB)               += libamr.o
 OBJS-$(CONFIG_LIBFAAC)                 += libfaac.o
 OBJS-$(CONFIG_LIBFAAD)                 += libfaad.o
 OBJS-$(CONFIG_LIBGSM)                  += libgsm.o