Remove internal liba52; external lib still works, native decoder coming up.

Originally committed as revision 7933 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 3 insertions, 10 deletions

diff --git a/configure b/configure
index 5e1d4a03d0..0047e52457 100755
--- a/configure
+++ b/configure
@@ -78,7 +78,6 @@ show_help(){
   echo "  --enable-x11grab         enable X11 grabbing [default=no]"
   echo "  --enable-dc1394          enable IIDC-1394 grabbing using libdc1394"
   echo "                           and libraw1394 [default=no]"
-  echo "  --enable-a52             enable GPLed liba52 support [default=no]"
   echo "  --enable-a52bin          open liba52.so.0 at runtime [default=no]"
   echo "  --enable-avisynth        allow reading AVISynth script files [default=no]"
   echo "  --enable-dts             enable GPLed libdts support [default=no]"
@@ -486,7 +485,6 @@ CONFIG_LIST='
     ffserver
     gpl
     ipv6
-    liba52
     liba52bin
     libdts
     libfaac
@@ -576,7 +574,7 @@ zmbv_encoder_deps="zlib"
 
 aac_decoder_deps="libfaad"
 mpeg4aac_decoder_deps="libfaad"
-ac3_decoder_deps="liba52"
+ac3_decoder_deps="liba52bin"
 amr_nb_decoder_deps_any="amr_nb amr_nb_fixed"
 amr_nb_encoder_deps_any="amr_nb amr_nb_fixed"
 amr_wb_decoder_deps="amr_wb"
@@ -741,7 +739,6 @@ avisynth="no"
 dc1394="no"
 dlfcn_h="no"
 dlopen="no"
-liba52="no"
 liba52bin="no"
 libdts="no"
 libfaac="no"
@@ -1040,9 +1037,7 @@ for opt do
   ;;
   --disable-zlib) zlib="no"
   ;;
-  --enable-a52) liba52="yes"
-  ;;
-  --enable-a52bin) liba52bin="yes";  liba52="yes"
+  --enable-a52bin) liba52bin="yes"
   ;;
   --enable-dts) libdts="yes"
   ;;
@@ -1261,7 +1256,7 @@ if disabled gpl ; then
         enabled_any $@ && die "$name is under GPL and --enable-gpl is not specified."
     }
     die_gpl_disabled "The Postprocessing code" pp
-    die_gpl_disabled "liba52"                  liba52 liba52bin
+    die_gpl_disabled "liba52"                  liba52bin
     die_gpl_disabled "libxvidcore"             xvid
     die_gpl_disabled "x264"                    x264
     die_gpl_disabled "libdts"                  libdts
@@ -1885,7 +1880,6 @@ if enabled sdl_too_old; then
 fi
 echo "Sun medialib support      $mlib"
 echo "AVISynth enabled          $avisynth"
-echo "liba52 support            $liba52"
 echo "liba52 dlopened           $liba52bin"
 echo "libdts support            $libdts"
 echo "libfaac enabled           $libfaac"
@@ -2092,7 +2086,6 @@ if enabled source_path_used; then
          libavcodec/sparc \
          libavcodec/mlib \
          libavcodec/ppc \
-         libavcodec/liba52 \
          libavcodec/amr \
          libavcodec/amr_float \
          libavcodec/amrwb_float \