RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-26 00:31:12 +00:00
Code Issues Projects Releases Wiki Activity

* link libfaad when needed

Browse Source 
Originally committed as revision 1862 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Zdenek Kabelac 2003-05-12 12:32:33 +00:00
parent aea22133c4
commit 445ad18d65
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -47,6 +47,14 @@ ifeq ($(CONFIG_VORBIS),yes)
EXTRALIBS+=-logg -lvorbis -lvorbisenc EXTRALIBS+=-logg -lvorbis -lvorbisenc
endif endif
ifeq ($(CONFIG_FAAD),yes)
ifeq ($(CONFIG_FAADBIN),yes)
# no libs needed
else
EXTRALIBS += -lfaad
endif
endif
ifeq ($(BUILD_VHOOK),yes) ifeq ($(BUILD_VHOOK),yes)
VHOOK=videohook VHOOK=videohook
INSTALLVHOOK=install-vhook INSTALLVHOOK=install-vhook

7
configure vendored
View File

@ -297,6 +297,10 @@ for opt do
;; ;;
--enable-vorbis) vorbis="yes" --enable-vorbis) vorbis="yes"
;; ;;
--enable-faad) faad="yes"
;;
--enable-faadbin) faadbin="yes"
;;
--disable-vhook) vhook="no" --disable-vhook) vhook="no"
;; ;;
--disable-simple_idct) simpleidct="no" --disable-simple_idct) simpleidct="no"
@ -654,6 +658,8 @@ echo "gprof enabled $gprof"
echo "zlib enabled $zlib" echo "zlib enabled $zlib"
echo "mp3lame enabled $mp3lame" echo "mp3lame enabled $mp3lame"
echo "vorbis enabled $vorbis" echo "vorbis enabled $vorbis"
echo "faad enabled $faad"
echo "faadbin enabled $faadbin"
echo "a52 support $a52" echo "a52 support $a52"
echo "a52 dlopened $a52bin" echo "a52 dlopened $a52bin"
echo "pp support $pp" echo "pp support $pp"
@ -852,6 +858,7 @@ fi
if test "$faadbin" = "yes" ; then if test "$faadbin" = "yes" ; then
echo "#define CONFIG_FAADBIN 1" >> $TMPH echo "#define CONFIG_FAADBIN 1" >> $TMPH
echo "CONFIG_FAADBIN=yes" >> config.mak
fi fi
if test "$win32" = "yes" ; then if test "$win32" = "yes" ; then

5
libavcodec/Makefile
View File

@ -38,6 +38,11 @@ endif
ifeq ($(CONFIG_FAAD),yes) ifeq ($(CONFIG_FAAD),yes)
OBJS+= faad.o OBJS+= faad.o
ifeq ($(CONFIG_FAADBIN),yes)
# no libs needed
else
EXTRALIBS += -lfaad
endif
endif endif
ifeq ($(CONFIG_PP),yes) ifeq ($(CONFIG_PP),yes)