Commit 64e13d69 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

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
parent 4f1ab3ce
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment