[Ffmpeg-cvslog] r7416 - in trunk: configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/faad.c libavformat/mov.c
diego
subversion
Sun Jan 7 00:54:02 CET 2007
Author: diego
Date: Sun Jan 7 00:54:01 2007
New Revision: 7416
Modified:
trunk/configure
trunk/libavcodec/Makefile
trunk/libavcodec/allcodecs.c
trunk/libavcodec/faad.c
trunk/libavformat/mov.c
Log:
Rename variables: faad --> libfaad, faac --> libfaac, faadbin --> libfaadbin
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sun Jan 7 00:54:01 2007
@@ -418,9 +418,6 @@
bktr
dc1394
dv1394
- faac
- faad
- faadbin
ffmpeg
ffplay
ffserver
@@ -429,6 +426,9 @@
liba52
liba52bin
libdts
+ libfaac
+ libfaad
+ libfaadbin
libgsm
libnut
libogg
@@ -592,15 +592,15 @@
zlib="yes"
liba52="no"
liba52bin="no"
+libfaac="no"
+libfaad="no"
+libfaadbin="no"
libgsm="no"
mp3lame="no"
libdts="no"
libnut="no"
libogg="no"
libvorbis="no"
-faad="no"
-faadbin="no"
-faac="no"
xvid="no"
x264="no"
pp="no"
@@ -954,11 +954,11 @@
--enable-vorbis) libvorbis="yes"
pkg_requires="$pkg_requires vorbis vorbisenc"
;;
- --enable-faad) faad="yes"
+ --enable-faad) libfaad="yes"
;;
- --enable-faadbin) faadbin="yes"
+ --enable-faadbin) libfaadbin="yes"
;;
- --enable-faac) faac="yes"
+ --enable-faac) libfaac="yes"
;;
--enable-xvid) xvid="yes"
;;
@@ -1148,7 +1148,7 @@
die "libdts is under GPL and --enable-gpl is not specified."
fi
- if test "$faad" != "no" -o "$faadbin" != "no"; then
+ if test "$libfaad" != "no" -o "$libfaadbin" != "no"; then
if check_header faad.h; then
check_cc << EOF
#include <faad.h>
@@ -1161,8 +1161,8 @@
die "FAAD2 is under GPL and --enable-gpl is not specified."
fi
else
- faad="no"
- faadbin="no"
+ libfaad="no"
+ libfaadbin="no"
echo "FAAD test failed."
fi
fi
@@ -1474,9 +1474,9 @@
enabled dc1394 && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394
enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
-# Ugh, faac uses stdcall calling convention on win32 so we can't use
+# Ugh, libfaac uses stdcall calling convention on win32 so we can't use
# the generic test functions
-if enabled faac; then
+if enabled libfaac; then
save_flags
temp_extralibs -lfaac
check_ld <<EOF && add_extralibs -lfaac || die "ERROR: libfaac not found"
@@ -1493,7 +1493,7 @@
# Ugh, recent faad2 versions have renamed all functions and #define the
# old names in faad.h. Generic tests won't work.
-if enabled faad; then
+if enabled libfaad; then
save_flags
temp_extralibs -lfaad
check_ld <<EOF && add_extralibs -lfaad || die "ERROR: libfaad not found"
@@ -1550,7 +1550,7 @@
vhook="$dlopen"
fi
-if enabled_any vhook liba52bin faadbin; then
+if enabled_any vhook liba52bin libfaadbin; then
add_extralibs $ldl
fi
@@ -1795,9 +1795,9 @@
echo "liba52 support $liba52"
echo "liba52 dlopened $liba52bin"
echo "libdts support $libdts"
-echo "libfaac enabled $faac"
-echo "libfaad enabled $faad"
-echo "faadbin enabled $faadbin"
+echo "libfaac enabled $libfaac"
+echo "libfaad enabled $libfaad"
+echo "faadbin enabled $libfaadbin"
echo "libgsm enabled $libgsm"
echo "libmp3lame enabled $mp3lame"
echo "libnut enabled $libnut"
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile (original)
+++ trunk/libavcodec/Makefile Sun Jan 7 00:54:01 2007
@@ -243,8 +243,8 @@
OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o
-OBJS-$(CONFIG_FAAD) += faad.o
-OBJS-$(CONFIG_FAAC) += faac.o
+OBJS-$(CONFIG_LIBFAAD) += faad.o
+OBJS-$(CONFIG_LIBFAAC) += faac.o
OBJS-$(CONFIG_XVID) += xvidff.o xvid_rc.o
OBJS-$(CONFIG_X264) += x264.o
OBJS-$(CONFIG_MP3LAME) += mp3lameaudio.o
Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c (original)
+++ trunk/libavcodec/allcodecs.c Sun Jan 7 00:54:01 2007
@@ -160,7 +160,7 @@
#endif
/* audio codecs */
-#ifdef CONFIG_FAAD
+#ifdef CONFIG_LIBFAAD
REGISTER_DECODER(AAC, aac);
REGISTER_DECODER(MPEG4AAC, mpeg4aac);
#endif
@@ -180,7 +180,7 @@
#ifdef CONFIG_LIBDTS
REGISTER_DECODER(DTS, dts);
#endif
-#ifdef CONFIG_FAAC
+#ifdef CONFIG_LIBFAAC
REGISTER_ENCODER(FAAC, faac);
#endif
REGISTER_ENCDEC (FLAC, flac);
Modified: trunk/libavcodec/faad.c
==============================================================================
--- trunk/libavcodec/faad.c (original)
+++ trunk/libavcodec/faad.c Sun Jan 7 00:54:01 2007
@@ -35,12 +35,12 @@
#endif
/*
- * when CONFIG_FAADBIN is defined the libfaad will be opened at runtime
+ * when CONFIG_LIBFAADBIN is defined the libfaad will be opened at runtime
*/
-//#undef CONFIG_FAADBIN
-//#define CONFIG_FAADBIN
+//#undef CONFIG_LIBFAADBIN
+//#define CONFIG_LIBFAADBIN
-#ifdef CONFIG_FAADBIN
+#ifdef CONFIG_LIBFAADBIN
#include <dlfcn.h>
static const char* libfaadname = "libfaad.so.0";
#else
@@ -208,7 +208,7 @@
FAACContext *s = (FAACContext *) avctx->priv_data;
faacDecConfigurationPtr faac_cfg;
-#ifdef CONFIG_FAADBIN
+#ifdef CONFIG_LIBFAADBIN
const char* err = 0;
s->handle = dlopen(libfaadname, RTLD_LAZY);
@@ -222,9 +222,9 @@
do { static const char* n = "faacDec" #a; \
if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0)
for(;;) {
-#else /* !CONFIG_FAADBIN */
+#else /* !CONFIG_LIBFAADBIN */
#define dfaac(a, b) s->faacDec ## a = faacDec ## a
-#endif /* CONFIG_FAADBIN */
+#endif /* CONFIG_LIBFAADBIN */
// resolve all needed function calls
dfaac(Open, (faacDecHandle FAADAPI (*)(void)));
@@ -256,7 +256,7 @@
#endif
#undef dfacc
-#ifdef CONFIG_FAADBIN
+#ifdef CONFIG_LIBFAADBIN
break;
}
if (err) {
Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c (original)
+++ trunk/libavformat/mov.c Sun Jan 7 00:54:01 2007
@@ -1012,7 +1012,7 @@
st->codec->width= 0; /* let decoder init width/height */
st->codec->height= 0;
break;
-#ifdef CONFIG_FAAD
+#ifdef CONFIG_LIBFAAD
case CODEC_ID_AAC:
#endif
#ifdef CONFIG_VORBIS_DECODER
More information about the ffmpeg-cvslog
mailing list