diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-01-26 12:46:46 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-01-26 12:46:46 +0000 |
| commit | 64e13d69145db9c1f6f2a0bc133c8ea6d9630b85 (patch) | |
| tree | 4c459529eb0ce0345e6cd80b0358cfbb5dd12f33 | |
| parent | 4f1ab3ceee9a4097ce045eca96c391b19625a423 (diff) | |
| download | ffmpeg-64e13d69145db9c1f6f2a0bc133c8ea6d9630b85.tar.gz | |
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
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | libavcodec/Makefile | 3 |
2 files changed, 2 insertions, 4 deletions
@@ -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 395a4a99cd..b7b1c1f5b1 100644 --- 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 |