diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-05-12 12:32:33 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-05-12 12:32:33 +0000 |
| commit | 445ad18d65156b57e694c7cc9c66dcdf26056166 (patch) | |
| tree | 2d14a8b821bf06ef90442c3f1b5c53459345cd7c | |
| parent | aea22133c47a90fe26482df46634d89a2c543ad5 (diff) | |
| download | ffmpeg-445ad18d65156b57e694c7cc9c66dcdf26056166.tar.gz | |
* link libfaad when needed
Originally committed as revision 1862 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 8 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | libavcodec/Makefile | 5 |
3 files changed, 20 insertions, 0 deletions
@@ -47,6 +47,14 @@ ifeq ($(CONFIG_VORBIS),yes) EXTRALIBS+=-logg -lvorbis -lvorbisenc endif +ifeq ($(CONFIG_FAAD),yes) +ifeq ($(CONFIG_FAADBIN),yes) +# no libs needed +else +EXTRALIBS += -lfaad +endif +endif + ifeq ($(BUILD_VHOOK),yes) VHOOK=videohook INSTALLVHOOK=install-vhook @@ -297,6 +297,10 @@ for opt do ;; --enable-vorbis) vorbis="yes" ;; + --enable-faad) faad="yes" + ;; + --enable-faadbin) faadbin="yes" + ;; --disable-vhook) vhook="no" ;; --disable-simple_idct) simpleidct="no" @@ -654,6 +658,8 @@ echo "gprof enabled $gprof" echo "zlib enabled $zlib" echo "mp3lame enabled $mp3lame" echo "vorbis enabled $vorbis" +echo "faad enabled $faad" +echo "faadbin enabled $faadbin" echo "a52 support $a52" echo "a52 dlopened $a52bin" echo "pp support $pp" @@ -852,6 +858,7 @@ fi if test "$faadbin" = "yes" ; then echo "#define CONFIG_FAADBIN 1" >> $TMPH + echo "CONFIG_FAADBIN=yes" >> config.mak fi if test "$win32" = "yes" ; then diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b7ba13095d..0ef7e17daa 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -38,6 +38,11 @@ endif ifeq ($(CONFIG_FAAD),yes) OBJS+= faad.o +ifeq ($(CONFIG_FAADBIN),yes) +# no libs needed +else +EXTRALIBS += -lfaad +endif endif ifeq ($(CONFIG_PP),yes) |