diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-11-13 23:14:24 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-11-13 23:14:24 +0000 |
| commit | 78e61cc5c6240a3451dc66d02c330febb8ed087b (patch) | |
| tree | 6a2e156f3793e31765929819b5c594d7a88f5ce8 | |
| parent | 68bbeacae3762726df4dd0caa83c00c9643003fb (diff) | |
| download | ffmpeg-78e61cc5c6240a3451dc66d02c330febb8ed087b.tar.gz | |
rename CONFIG_HAVE_DLFCN and CONFIG_HAVE_DLOPEN to HAVE_DLFCN/HAVE_DLOPEN
Originally committed as revision 7018 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | ffserver.c | 6 | ||||
| -rw-r--r-- | libavformat/framehook.c | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -1972,11 +1972,11 @@ if test "$dc1394" = "yes" ; then fi if test "$dlopen" = "yes" ; then - echo "#define CONFIG_HAVE_DLOPEN 1" >> $TMPH + echo "#define HAVE_DLOPEN 1" >> $TMPH fi if test "$dlfcn" = "yes" ; then - echo "#define CONFIG_HAVE_DLFCN 1" >> $TMPH + echo "#define HAVE_DLFCN 1" >> $TMPH fi if test "$audio_oss" = "yes" ; then diff --git a/ffserver.c b/ffserver.c index 3c94a28749..4100ec23d7 100644 --- a/ffserver.c +++ b/ffserver.c @@ -37,7 +37,7 @@ #include <arpa/inet.h> #include <netdb.h> #include <signal.h> -#ifdef CONFIG_HAVE_DLFCN +#ifdef HAVE_DLFCN #include <dlfcn.h> #endif @@ -3706,7 +3706,7 @@ static int opt_video_codec(const char *arg) /* simplistic plugin support */ -#ifdef CONFIG_HAVE_DLOPEN +#ifdef HAVE_DLOPEN static void load_module(const char *filename) { void *dll; @@ -4377,7 +4377,7 @@ static int parse_ffconfig(const char *filename) redirect = NULL; } else if (!strcasecmp(cmd, "LoadModule")) { get_arg(arg, sizeof(arg), &p); -#ifdef CONFIG_HAVE_DLOPEN +#ifdef HAVE_DLOPEN load_module(arg); #else fprintf(stderr, "%s:%d: Module support not compiled into this version: '%s'\n", diff --git a/libavformat/framehook.c b/libavformat/framehook.c index c85296160b..df1f4b55d7 100644 --- a/libavformat/framehook.c +++ b/libavformat/framehook.c @@ -23,7 +23,7 @@ #include "avformat.h" #include "framehook.h" -#ifdef CONFIG_HAVE_DLFCN +#ifdef HAVE_DLFCN #include <dlfcn.h> #endif |