recommit of

[ffmpeg] / configure

diff --git a/configure b/configure
index 7bab964dd597ff39396ab4be9fe2113845abd538..15a66b61d3af626f4eeee0f60be2ba269c528df2 100755 (executable)
--- a/configure
+++ b/configure
@@ -71,6 +71,7 @@ mp3lame="no"
 vorbis="no"
 faad="no"
 faadbin="no"
+faac="no"
 a52="no"
 a52bin="no"
 pp="no"
@@ -323,6 +324,8 @@ for opt do
   ;;
   --enable-faadbin) faadbin="yes"
   ;;
+  --enable-faac) faac="yes"
+  ;;
   --disable-vhook) vhook="no"
   ;;
   --disable-simple_idct) simpleidct="no"
@@ -764,6 +767,7 @@ echo "  --enable-mp3lame         enable mp3 encoding via libmp3lame [default=no]
 echo "  --enable-vorbis          enable vorbis support via libvorbisenc [default=no]"
 echo "  --enable-faad            enable faad support via libfaad [default=no]"
 echo "  --enable-faadbin         build faad support with runtime linking [default=no]"
+echo "  --enable-faac            enable faac support via libfaac [default=no]"
 echo "  --enable-mingw32         enable mingw32 native/cross windows compile"
 echo "  --enable-a52             enable GPL'ed A52 support [default=no]"
 echo "  --enable-a52bin          open liba52.so.0 at runtime [default=no]"
@@ -831,6 +835,7 @@ echo "mp3lame enabled  $mp3lame"
 echo "vorbis enabled   $vorbis"
 echo "faad enabled     $faad"
 echo "faadbin enabled  $faadbin"
+echo "faac enabled     $faac"
 echo "a52 support      $a52"
 echo "a52 dlopened     $a52bin"
 echo "pp support       $pp"
@@ -1062,6 +1067,11 @@ if test "$faadbin" = "yes" ; then
   echo "CONFIG_FAADBIN=yes" >> config.mak
 fi
 
+if test "$faac" = "yes" ; then
+  echo "#define CONFIG_FAAC 1" >> $TMPH
+  echo "CONFIG_FAAC=yes" >> config.mak
+fi
+
 if test "$mingw32" = "yes" ; then
   echo "#define CONFIG_WIN32 1" >> $TMPH
   echo "CONFIG_WIN32=yes" >> config.mak