]> git.sesse.net Git - ffmpeg/commitdiff
lavfi/frei0r: load plugins from lib64 folders as well on 64bit builds
authorMarton Balint <cus@passwd.hu>
Wed, 5 Feb 2014 00:24:19 +0000 (01:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Feb 2014 02:25:00 +0000 (03:25 +0100)
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_frei0r.c

index a070eb4726f963149934546f11f35a60f8e84187..c5922fdaadb38a81e0e379d427a75ccd0b784220 100644 (file)
@@ -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);