mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-01-05 21:55:37 +01:00
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
This commit is contained in:
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user