diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavcodec/libfaad.c | |
parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
download | ffmpeg-streaming-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.zip ffmpeg-streaming-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.tar.gz |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/libfaad.c')
-rw-r--r-- | libavcodec/libfaad.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/libfaad.c b/libavcodec/libfaad.c index c6da20d..7cf39e2 100644 --- a/libavcodec/libfaad.c +++ b/libavcodec/libfaad.c @@ -35,12 +35,13 @@ #endif /* - * when CONFIG_LIBFAADBIN is defined the libfaad will be opened at runtime + * when CONFIG_LIBFAADBIN is true libfaad will be opened at runtime */ //#undef CONFIG_LIBFAADBIN -//#define CONFIG_LIBFAADBIN +//#define CONFIG_LIBFAADBIN 0 +//#define CONFIG_LIBFAADBIN 1 -#ifdef CONFIG_LIBFAADBIN +#if CONFIG_LIBFAADBIN #include <dlfcn.h> static const char* const libfaadname = "libfaad.so"; #else @@ -224,7 +225,7 @@ static av_cold int faac_decode_init(AVCodecContext *avctx) FAACContext *s = avctx->priv_data; faacDecConfigurationPtr faac_cfg; -#ifdef CONFIG_LIBFAADBIN +#if CONFIG_LIBFAADBIN const char* err = 0; s->handle = dlopen(libfaadname, RTLD_LAZY); @@ -259,7 +260,7 @@ static av_cold int faac_decode_init(AVCodecContext *avctx) #undef dfaac -#ifdef CONFIG_LIBFAADBIN +#if CONFIG_LIBFAADBIN if (err) { dlclose(s->handle); av_log(avctx, AV_LOG_ERROR, "FAAD library: cannot resolve %s in %s!\n", |