[FFmpeg-cvslog] lavfi/frei0r: load plugins from lib64 folders as well on 64bit builds

Marton Balint git at videolan.org
Tue Feb 11 03:44:38 CET 2014


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Wed Feb  5 01:24:19 2014 +0100| [8e41240047db2571a4752fb23c3e6907b16d1e88] | committer: Michael Niedermayer

lavfi/frei0r: load plugins from lib64 folders as well on 64bit builds

Signed-off-by: Marton Balint <cus at passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e41240047db2571a4752fb23c3e6907b16d1e88
---

 libavfilter/vf_frei0r.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index a070eb4..c5922fd 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);



More information about the ffmpeg-cvslog mailing list