Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'

* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9':
  vf_frei0r: adjust error messages

Conflicts:
	libavfilter/vf_frei0r.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavfilter/vf_frei0r.c
index dbf3398,b3ac61e..b042ac0
--- 1/libavfilter/vf_frei0r.c
--- 2/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@@ -212,15 -208,13 +212,15 @@@ static int set_params(AVFilterContext *
      return 0;
  }
  
 -static void *load_path(AVFilterContext *ctx, const char *prefix, const char *name)
 +static int load_path(AVFilterContext *ctx, void **handle_ptr, const char *prefix, const char *name)
  {
 -    char path[1024];
 -
 -    snprintf(path, sizeof(path), "%s%s%s", prefix, name, SLIBSUF);
 +    char *path = av_asprintf("%s%s%s", prefix, name, SLIBSUF);
 +    if (!path)
 +        return AVERROR(ENOMEM);
-     av_log(ctx, AV_LOG_DEBUG, "Looking for frei0r effect in '%s'\n", path);
+     av_log(ctx, AV_LOG_DEBUG, "Looking for frei0r effect in '%s'.\n", path);
 -    return dlopen(path, RTLD_NOW|RTLD_LOCAL);
 +    *handle_ptr = dlopen(path, RTLD_NOW|RTLD_LOCAL);
 +    av_free(path);
 +    return 0;
  }
  
  static av_cold int frei0r_init(AVFilterContext *ctx,
@@@ -245,50 -231,25 +245,50 @@@
          return AVERROR(EINVAL);
      }
  
 -    /* see: http://piksel.org/frei0r/1.2/spec/1.2/spec/group__pluglocations.html */
 +    /* see: http://frei0r.dyne.org/codedoc/html/group__pluglocations.html */
      if ((path = av_strdup(getenv("FREI0R_PATH")))) {
 +#ifdef _WIN32
 +        const char *separator = ";";
 +#else
 +        const char *separator = ":";
 +#endif
          char *p, *ptr = NULL;
 -        for (p = path; p = strtok_r(p, ":", &ptr); p = NULL)
 -            if (s->dl_handle = load_path(ctx, p, dl_name))
 +        for (p = path; p = av_strtok(p, separator, &ptr); p = NULL) {
 +            /* add additional trailing slash in case it is missing */
 +            char *p1 = av_asprintf("%s/", p);
 +            if (!p1) {
 +                ret = AVERROR(ENOMEM);
 +                goto check_path_end;
 +            }
 +            ret = load_path(ctx, &s->dl_handle, p1, dl_name);
 +            av_free(p1);
 +            if (ret < 0)
 +                goto check_path_end;
 +            if (s->dl_handle)
                  break;
 +        }
 +
 +    check_path_end:
          av_free(path);
 +        if (ret < 0)
 +            return ret;
      }
      if (!s->dl_handle && (path = getenv("HOME"))) {
 -        char prefix[1024];
 -        snprintf(prefix, sizeof(prefix), "%s/.frei0r-1/lib/", path);
 -        s->dl_handle = load_path(ctx, prefix, dl_name);
 +        char *prefix = av_asprintf("%s/.frei0r-1/lib/", path);
 +        if (!prefix)
 +            return AVERROR(ENOMEM);
 +        ret = load_path(ctx, &s->dl_handle, prefix, dl_name);
 +        av_free(prefix);
 +        if (ret < 0)
 +            return ret;
 +    }
 +    for (i = 0; !s->dl_handle && i < FF_ARRAY_ELEMS(frei0r_pathlist); i++) {
 +        ret = load_path(ctx, &s->dl_handle, frei0r_pathlist[i], dl_name);
 +        if (ret < 0)
 +            return ret;
      }
 -    if (!s->dl_handle)
 -        s->dl_handle = load_path(ctx, "/usr/local/lib/frei0r-1/", dl_name);
 -    if (!s->dl_handle)
 -        s->dl_handle = load_path(ctx, "/usr/lib/frei0r-1/", dl_name);
      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);
      }