diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-01-06 23:33:43 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-01-06 23:33:43 +0000 |
| commit | f8904fd959c01fe0798ce587e216bd1fe057a8e7 (patch) | |
| tree | 0d8f818d6a886ed95986b51f6fb75887e76efe25 /libavcodec | |
| parent | bfd5afd84404f0e8473653791af273ced7e9ee8e (diff) | |
Rename variables: a52 --> liba52, a52bin --> liba52bin
Originally committed as revision 7414 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/a52dec.c | 8 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index dca1968b2d..a3f5baa51b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -252,10 +252,10 @@ OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.o OBJS-$(CONFIG_LIBGSM) += libgsm.o # currently using liba52 for ac3 decoding -OBJS-$(CONFIG_A52) += a52dec.o +OBJS-$(CONFIG_LIBA52) += a52dec.o # using builtin liba52 or runtime linked liba52.so.0 -OBJS-$(CONFIG_A52)$(CONFIG_A52BIN) += liba52/bit_allocate.o \ +OBJS-$(CONFIG_LIBA52)$(CONFIG_LIBA52BIN) += liba52/bit_allocate.o \ liba52/bitstream.o \ liba52/downmix.o \ liba52/imdct.o \ diff --git a/libavcodec/a52dec.c b/libavcodec/a52dec.c index dec25138e6..e810bc7d77 100644 --- a/libavcodec/a52dec.c +++ b/libavcodec/a52dec.c @@ -27,7 +27,7 @@ #include "avcodec.h" #include "liba52/a52.h" -#ifdef CONFIG_A52BIN +#ifdef CONFIG_LIBA52BIN #include <dlfcn.h> static const char* liba52name = "liba52.so.0"; #endif @@ -70,7 +70,7 @@ typedef struct AC3DecodeState { } AC3DecodeState; -#ifdef CONFIG_A52BIN +#ifdef CONFIG_LIBA52BIN static void* dlsymm(void* handle, const char* symbol) { void* f = dlsym(handle, symbol); @@ -84,7 +84,7 @@ static int a52_decode_init(AVCodecContext *avctx) { AC3DecodeState *s = avctx->priv_data; -#ifdef CONFIG_A52BIN +#ifdef CONFIG_LIBA52BIN s->handle = dlopen(liba52name, RTLD_LAZY); if (!s->handle) { @@ -239,7 +239,7 @@ static int a52_decode_end(AVCodecContext *avctx) { AC3DecodeState *s = avctx->priv_data; s->a52_free(s->state); -#ifdef CONFIG_A52BIN +#ifdef CONFIG_LIBA52BIN dlclose(s->handle); #endif return 0; diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index c5831d2a2a..cf1863139c 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -164,7 +164,7 @@ void avcodec_register_all(void) REGISTER_DECODER(AAC, aac); REGISTER_DECODER(MPEG4AAC, mpeg4aac); #endif -#ifdef CONFIG_A52 +#ifdef CONFIG_LIBA52 REGISTER_DECODER(AC3, ac3); #endif REGISTER_ENCODER(AC3, ac3); |