[SCM] libav/experimental: Try to make this compile on platforms with dlfcn.h
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:34:27 UTC 2013
The following commit has been merged in the experimental branch:
commit 6638d424d41a61c4004d98f57f8cbbf9188965c9
Author: Philip Gladstone <philipjsg at users.sourceforge.net>
Date: Sat Nov 30 17:18:59 2002 +0000
Try to make this compile on platforms with dlfcn.h
Originally committed as revision 1296 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffserver.c b/ffserver.c
index 1be33eb..1d0939d 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -35,7 +35,9 @@
#include <netdb.h>
#include <ctype.h>
#include <signal.h>
+#ifdef CONFIG_HAVE_DLFCN
#include <dlfcn.h>
+#endif
#include "ffserver.h"
@@ -3596,6 +3598,7 @@ int opt_video_codec(const char *arg)
/* simplistic plugin support */
+#ifdef CONFIG_HAVE_DLOPEN
void load_module(const char *filename)
{
void *dll;
@@ -3617,6 +3620,7 @@ void load_module(const char *filename)
init_func();
}
+#endif
int parse_ffconfig(const char *filename)
{
@@ -4204,7 +4208,13 @@ int parse_ffconfig(const char *filename)
redirect = NULL;
} else if (!strcasecmp(cmd, "LoadModule")) {
get_arg(arg, sizeof(arg), &p);
+#ifdef CONFIG_HAVE_DLOPEN
load_module(arg);
+#else
+ fprintf(stderr, "%s:%d: Module support not compiled into this version: '%s'\n",
+ filename, line_num, arg);
+ errors++;
+#endif
} else {
fprintf(stderr, "%s:%d: Incorrect keyword: '%s'\n",
filename, line_num, cmd);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list