diff options
author | Marton Balint <cus@passwd.hu> | 2014-02-05 01:24:19 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-11 03:25:00 +0100 |
commit | 8e41240047db2571a4752fb23c3e6907b16d1e88 (patch) | |
tree | 1eb72152133210e0395490826da2297a6ca52c5d | |
parent | 1ff42685fee2ea7db21db808fc5804382b0edba2 (diff) | |
download | ffmpeg-8e41240047db2571a4752fb23c3e6907b16d1e88.tar.gz |
lavfi/frei0r: load plugins from lib64 folders as well on 64bit builds
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavfilter/vf_frei0r.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index a070eb4726..c5922fdaad 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -284,6 +284,18 @@ static av_cold int frei0r_init(AVFilterContext *ctx, 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) { av_log(ctx, AV_LOG_ERROR, "Could not find module '%s'\n", dl_name); return AVERROR(EINVAL); |