Commit 1c9741a0 authored by philipjsg's avatar philipjsg

Try to make this compile on platforms with dlfcn.h


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1296 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent ae76b813
...@@ -35,7 +35,9 @@ ...@@ -35,7 +35,9 @@
#include <netdb.h> #include <netdb.h>
#include <ctype.h> #include <ctype.h>
#include <signal.h> #include <signal.h>
#ifdef CONFIG_HAVE_DLFCN
#include <dlfcn.h> #include <dlfcn.h>
#endif
#include "ffserver.h" #include "ffserver.h"
...@@ -3596,6 +3598,7 @@ int opt_video_codec(const char *arg) ...@@ -3596,6 +3598,7 @@ int opt_video_codec(const char *arg)
/* simplistic plugin support */ /* simplistic plugin support */
#ifdef CONFIG_HAVE_DLOPEN
void load_module(const char *filename) void load_module(const char *filename)
{ {
void *dll; void *dll;
...@@ -3617,6 +3620,7 @@ void load_module(const char *filename) ...@@ -3617,6 +3620,7 @@ void load_module(const char *filename)
init_func(); init_func();
} }
#endif
int parse_ffconfig(const char *filename) int parse_ffconfig(const char *filename)
{ {
...@@ -4204,7 +4208,13 @@ int parse_ffconfig(const char *filename) ...@@ -4204,7 +4208,13 @@ int parse_ffconfig(const char *filename)
redirect = NULL; redirect = NULL;
} else if (!strcasecmp(cmd, "LoadModule")) { } else if (!strcasecmp(cmd, "LoadModule")) {
get_arg(arg, sizeof(arg), &p); get_arg(arg, sizeof(arg), &p);
#ifdef CONFIG_HAVE_DLOPEN
load_module(arg); load_module(arg);
#else
fprintf(stderr, "%s:%d: Module support not compiled into this version: '%s'\n",
filename, line_num, arg);
errors++;
#endif
} else { } else {
fprintf(stderr, "%s:%d: Incorrect keyword: '%s'\n", fprintf(stderr, "%s:%d: Incorrect keyword: '%s'\n",
filename, line_num, cmd); filename, line_num, cmd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment