Mercurial > libavcodec.hg

changeset 4334:bc434522dfc2 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename variables: a52 --> liba52, a52bin --> liba52bin
author diego
date Sat, 06 Jan 2007 23:33:43 +0000
parents 018b316baca7
children d11fd43834fe
files Makefile a52dec.c allcodecs.c
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Jan 03 11:32:02 2007 +0000
+++ b/Makefile	Sat Jan 06 23:33:43 2007 +0000
@@ -252,10 +252,10 @@
 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        \
--- a/a52dec.c	Wed Jan 03 11:32:02 2007 +0000
+++ b/a52dec.c	Sat Jan 06 23:33:43 2007 +0000
@@ -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 @@
 
 } AC3DecodeState;
 
-#ifdef CONFIG_A52BIN
+#ifdef CONFIG_LIBA52BIN
 static void* dlsymm(void* handle, const char* symbol)
 {
     void* f = dlsym(handle, symbol);
@@ -84,7 +84,7 @@
 {
     AC3DecodeState *s = avctx->priv_data;
 
-#ifdef CONFIG_A52BIN
+#ifdef CONFIG_LIBA52BIN
     s->handle = dlopen(liba52name, RTLD_LAZY);
     if (!s->handle)
     {
@@ -239,7 +239,7 @@
 {
     AC3DecodeState *s = avctx->priv_data;
     s->a52_free(s->state);
-#ifdef CONFIG_A52BIN
+#ifdef CONFIG_LIBA52BIN
     dlclose(s->handle);
 #endif
     return 0;
--- a/allcodecs.c	Wed Jan 03 11:32:02 2007 +0000
+++ b/allcodecs.c	Sat Jan 06 23:33:43 2007 +0000
@@ -164,7 +164,7 @@
     REGISTER_DECODER(AAC, aac);
     REGISTER_DECODER(MPEG4AAC, mpeg4aac);
 #endif
-#ifdef CONFIG_A52
+#ifdef CONFIG_LIBA52
     REGISTER_DECODER(AC3, ac3);
 #endif
     REGISTER_ENCODER(AC3, ac3);