[Ffmpeg-cvslog] r7933 - in trunk: configure libavcodec/Makefile libavcodec/a52dec.c libavcodec/liba52

[diego]

Author: diego
Date: Sun Feb 11 17:29:00 2007
New Revision: 7933

Removed:
   trunk/libavcodec/liba52/
Modified:
   trunk/configure
   trunk/libavcodec/Makefile
   trunk/libavcodec/a52dec.c

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


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun Feb 11 17:29:00 2007
@@ -78,7 +78,6 @@
   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 @@
     ffserver
     gpl
     ipv6
-    liba52
     liba52bin
     libdts
     libfaac
@@ -576,7 +574,7 @@
 
 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 @@
 dc1394="no"
 dlfcn_h="no"
 dlopen="no"
-liba52="no"
 liba52bin="no"
 libdts="no"
 libfaac="no"
@@ -1040,9 +1037,7 @@
   ;;
   --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 @@
         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 @@
 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 @@
          libavcodec/sparc \
          libavcodec/mlib \
          libavcodec/ppc \
-         libavcodec/liba52 \
          libavcodec/amr \
          libavcodec/amr_float \
          libavcodec/amrwb_float \

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Sun Feb 11 17:29:00 2007
@@ -248,14 +248,7 @@
 OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)    += adpcm.o
 
 # external codec libraries
-OBJS-$(CONFIG_LIBA52)                  += a52dec.o
-OBJS-$(CONFIG_LIBA52)$(CONFIG_LIBA52BIN)  += liba52/bit_allocate.o \
-                                             liba52/bitstream.o    \
-                                             liba52/downmix.o      \
-                                             liba52/imdct.o        \
-                                             liba52/parse.o        \
-                                             liba52/crc.o          \
-                                             liba52/resample.o
+OBJS-$(CONFIG_LIBA52BIN)               += a52dec.o
 OBJS-$(CONFIG_LIBDTS)                  += dtsdec.o
 OBJS-$(CONFIG_LIBFAAC)                 += faac.o
 OBJS-$(CONFIG_LIBFAAD)                 += faad.o
@@ -435,7 +428,6 @@
 	   ps2/*.o ps2/*~ \
 	   sh4/*.o sh4/*~ \
 	   sparc/*.o sparc/*~ \
-	   liba52/*.o liba52/*~ \
 	   amr_float/*.o \
 	   apiexample $(TESTS)
 	-$(MAKE) -C amr clean

Modified: trunk/libavcodec/a52dec.c
==============================================================================
--- trunk/libavcodec/a52dec.c	(original)
+++ trunk/libavcodec/a52dec.c	Sun Feb 11 17:29:00 2007
@@ -25,12 +25,9 @@
  */
 
 #include "avcodec.h"
-#include "liba52/a52.h"
-
-#ifdef CONFIG_LIBA52BIN
+#include <a52dec/a52.h>
 #include <dlfcn.h>
 static const char* liba52name = "liba52.so.0";
-#endif
 
 /**
  * liba52 - Copyright (C) Aaron Holtzman
@@ -70,7 +67,6 @@
 
 } AC3DecodeState;
 
-#ifdef CONFIG_LIBA52BIN
 static void* dlsymm(void* handle, const char* symbol)
 {
     void* f = dlsym(handle, symbol);
@@ -78,13 +74,11 @@
         av_log( NULL, AV_LOG_ERROR, "A52 Decoder - function '%s' can't be resolved\n", symbol);
     return f;
 }
-#endif
 
 static int a52_decode_init(AVCodecContext *avctx)
 {
     AC3DecodeState *s = avctx->priv_data;
 
-#ifdef CONFIG_LIBA52BIN
     s->handle = dlopen(liba52name, RTLD_LAZY);
     if (!s->handle)
     {
@@ -103,16 +97,6 @@
         dlclose(s->handle);
         return -1;
     }
-#else
-    /* static linked version */
-    s->handle = 0;
-    s->a52_init = a52_init;
-    s->a52_samples = a52_samples;
-    s->a52_syncinfo = a52_syncinfo;
-    s->a52_frame = a52_frame;
-    s->a52_block = a52_block;
-    s->a52_free = a52_free;
-#endif
     s->state = s->a52_init(0); /* later use CPU flags */
     s->samples = s->a52_samples(s->state);
     s->inbuf_ptr = s->inbuf;
@@ -242,9 +226,7 @@
 {
     AC3DecodeState *s = avctx->priv_data;
     s->a52_free(s->state);
-#ifdef CONFIG_LIBA52BIN
     dlclose(s->handle);
-#endif
     return 0;
 }