Revision 445ad18d

View differences:

Makefile
47 47
EXTRALIBS+=-logg -lvorbis -lvorbisenc
48 48
endif
49 49

  
50
ifeq ($(CONFIG_FAAD),yes)
51
ifeq ($(CONFIG_FAADBIN),yes)
52
# no libs needed
53
else
54
EXTRALIBS += -lfaad
55
endif
56
endif
57

  
50 58
ifeq ($(BUILD_VHOOK),yes)
51 59
VHOOK=videohook
52 60
INSTALLVHOOK=install-vhook
configure
297 297
  ;;
298 298
  --enable-vorbis) vorbis="yes"
299 299
  ;;
300
  --enable-faad) faad="yes"
301
  ;;
302
  --enable-faadbin) faadbin="yes"
303
  ;;
300 304
  --disable-vhook) vhook="no"
301 305
  ;;
302 306
  --disable-simple_idct) simpleidct="no"
......
654 658
echo "zlib enabled     $zlib"
655 659
echo "mp3lame enabled  $mp3lame"
656 660
echo "vorbis enabled   $vorbis"
661
echo "faad enabled     $faad"
662
echo "faadbin enabled  $faadbin"
657 663
echo "a52 support      $a52"
658 664
echo "a52 dlopened     $a52bin"
659 665
echo "pp support       $pp"
......
852 858

  
853 859
if test "$faadbin" = "yes" ; then
854 860
  echo "#define CONFIG_FAADBIN 1" >> $TMPH
861
  echo "CONFIG_FAADBIN=yes" >> config.mak
855 862
fi
856 863

  
857 864
if test "$win32" = "yes" ; then
libavcodec/Makefile
38 38

  
39 39
ifeq ($(CONFIG_FAAD),yes)
40 40
OBJS+= faad.o
41
ifeq ($(CONFIG_FAADBIN),yes)
42
# no libs needed
43
else
44
EXTRALIBS += -lfaad
45
endif
41 46
endif
42 47

  
43 48
ifeq ($(CONFIG_PP),yes)

Also available in: Unified diff