Skip to content
Snippets Groups Projects
Commit 6638d424 authored by Philip Gladstone's avatar Philip Gladstone
Browse files

Try to make this compile on platforms with dlfcn.h

Originally committed as revision 1296 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6c11d48c
No related branches found
No related tags found
No related merge requests found
...@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment