diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2002-04-22 19:57:45 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2002-04-22 19:57:45 +0000 |
| commit | 5751432312d00b707df88d6cda700d76add2b91c (patch) | |
| tree | 63a5fb55297c2163975e1f283b6792572a19243e /libavcodec | |
| parent | 623563c04a8d32b520bb4fed52851338976daa4d (diff) | |
| download | ffmpeg-5751432312d00b707df88d6cda700d76add2b91c.tar.gz | |
* using liba52
Originally committed as revision 417 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 18 | ||||
| -rw-r--r-- | libavcodec/a52dec.c | 9 |
2 files changed, 15 insertions, 12 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6afa15941b..a2b1cc035a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -10,11 +10,15 @@ OBJS= common.o utils.o mpegvideo.o h263.o jrevdct.o jfdctfst.o \ ratecontrol.o ASM_OBJS= -# currently using libac3 for ac3 decoding +# currently using liba52 for ac3 decoding ifeq ($(CONFIG_AC3),yes) -OBJS+= ac3dec.o \ - libac3/bit_allocate.o libac3/bitstream.o libac3/downmix.o \ - libac3/imdct.o libac3/parse.o +OBJS+= a52dec.o +endif + +# using builtin liba52 or runtime linked liba52.so.0 +ifeq ($(CONFIG_A52BIN),no) +OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \ + liba52/imdct.o liba52/parse.o endif ifeq ($(CONFIG_MP3LAME),yes) @@ -30,7 +34,7 @@ endif ifeq ($(TARGET_MMX),yes) OBJS += i386/fdct_mmx.o i386/cputest.o \ i386/dsputil_mmx.o i386/mpegvideo_mmx.o \ - i386/idct_mmx.o i386/motion_est_mmx.o \ + i386/idct_mmx.o i386/motion_est_mmx.o \ i386/simple_idct_mmx.o endif @@ -91,8 +95,8 @@ clean: armv4l/*.o armv4l/*~ \ mlib/*.o mlib/*~ \ alpha/*.o alpha/*~ \ - libac3/*.o libac3/*~ \ - apiexample $(TESTS) + liba52/*.o liba52/*~ \ + apiexample $(TESTS) distclean: clean rm -f Makefile.bak .depend diff --git a/libavcodec/a52dec.c b/libavcodec/a52dec.c index 419ce05240..7ed9ba9791 100644 --- a/libavcodec/a52dec.c +++ b/libavcodec/a52dec.c @@ -19,7 +19,7 @@ #include "avcodec.h" #include "liba52/a52.h" -#ifdef LIBAVCODEC_A52BIN +#ifdef CONFIG_A52BIN #include <dlfcn.h> static const char* liba52name = "liba52.so.0"; #endif @@ -62,7 +62,7 @@ typedef struct AC3DecodeState { } AC3DecodeState; -#ifdef LIBAVCODEC_A52BIN +#ifdef CONFIG_A52BIN static void* dlsymm(void* handle, const char* symbol) { void* f = dlsym(handle, symbol); @@ -76,7 +76,7 @@ static int a52_decode_init(AVCodecContext *avctx) { AC3DecodeState *s = avctx->priv_data; -#ifdef LIBAVCODEC_A52BIN +#ifdef CONFIG_A52BIN s->handle = dlopen(liba52name, RTLD_LAZY); if (!s->handle) { @@ -95,7 +95,6 @@ static int a52_decode_init(AVCodecContext *avctx) dlclose(s->handle); return -1; } - printf("INITIALIZED\n"); #else /* static linked version */ s->handle = 0; @@ -233,7 +232,7 @@ static int a52_decode_end(AVCodecContext *avctx) { AC3DecodeState *s = avctx->priv_data; s->a52_free(s->state); -#ifdef LIBAVCODEC_A52BIN +#ifdef CONFIG_A52BIN dlclose(s->handle); #endif return 0; |