highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cus/stable'

Browse Source 
* cus/stable:
  lavfi/frei0r: factorize plugin loading with static path
  lavfi/frei0r: search plugins in lib64 dirs on all architectures

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-02-28 03:31:07 +01:00
parent e8e91a32e5 ead0dd3cf6
commit 669043db81
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libavfilter/vf_frei0r.c
View File

@@ -29,6 +29,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "config.h" #include "config.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/common.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
@@ -231,6 +232,13 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
f0r_plugin_info_t *pi; f0r_plugin_info_t *pi;
char *path; char *path;
int ret = 0; int ret = 0;
int i;
static const char* const frei0r_pathlist[] = {
"/usr/local/lib/frei0r-1/",
"/usr/lib/frei0r-1/",
"/usr/local/lib64/frei0r-1/",
"/usr/lib64/frei0r-1/"
};
if (!dl_name) { if (!dl_name) {
av_log(ctx, AV_LOG_ERROR, "No filter name provided.\n"); av_log(ctx, AV_LOG_ERROR, "No filter name provided.\n");
@@ -274,28 +282,11 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
if (!s->dl_handle) { for (i = 0; !s->dl_handle && i < FF_ARRAY_ELEMS(frei0r_pathlist); i++) {
ret = load_path(ctx, &s->dl_handle, "/usr/local/lib/frei0r-1/", dl_name); ret = load_path(ctx, &s->dl_handle, frei0r_pathlist[i], dl_name);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
if (!s->dl_handle) {
ret = load_path(ctx, &s->dl_handle, "/usr/lib/frei0r-1/", dl_name);
if (ret < 0)
return ret;
}
#if ARCH_X86_64
if (!s->dl_handle) {
ret = load_path(ctx, &s->dl_handle, "/usr/local/lib64/frei0r-1/", dl_name);
if (ret < 0)
return ret;
}
if (!s->dl_handle) {
ret = load_path(ctx, &s->dl_handle, "/usr/lib64/frei0r-1/", dl_name);
if (ret < 0)
return ret;
}
#endif
if (!s->dl_handle) { if (!s->dl_handle) {
av_log(ctx, AV_LOG_ERROR, "Could not find module '%s'\n", dl_name); av_log(ctx, AV_LOG_ERROR, "Could not find module '%s'\n", dl_name);
return AVERROR(EINVAL); return AVERROR(EINVAL);