generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not group libamr_nb and libamr_wb together as libamr.

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

Originally committed as revision 11616 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2008-01-26 12:46:46 +00:00
parent 4f1ab3ceee
commit 64e13d6914
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

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

3
libavcodec/Makefile
View File

@ -304,7 +304,8 @@ OBJS-$(CONFIG_OGG_MUXER) += xiph.o
# external codec libraries # external codec libraries
OBJS-$(CONFIG_LIBA52) += liba52.o 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_LIBFAAC) += libfaac.o
OBJS-$(CONFIG_LIBFAAD) += libfaad.o OBJS-$(CONFIG_LIBFAAD) += libfaad.o
OBJS-$(CONFIG_LIBGSM) += libgsm.o OBJS-$(CONFIG_LIBGSM) += libgsm.o