libavfilter/vf_frei0r.c: Use UTF-8 version of getenv()

Signed-off-by: Martin Storsjö <martin@martin.st>
release/5.1
Nil Admirari 3 years ago committed by Martin Storsjö
parent c381f5412f
commit 69364a06c6
  1. 14
      libavfilter/vf_frei0r.c

@ -31,6 +31,7 @@
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/eval.h" #include "libavutil/eval.h"
#include "libavutil/getenv_utf8.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"
@ -204,7 +205,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
} }
/* see: http://frei0r.dyne.org/codedoc/html/group__pluglocations.html */ /* see: http://frei0r.dyne.org/codedoc/html/group__pluglocations.html */
if ((path = av_strdup(getenv("FREI0R_PATH")))) { if (path = getenv_dup("FREI0R_PATH")) {
#ifdef _WIN32 #ifdef _WIN32
const char *separator = ";"; const char *separator = ";";
#else #else
@ -231,12 +232,17 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
if (!s->dl_handle && (path = getenv("HOME"))) { if (!s->dl_handle && (path = getenv_utf8("HOME"))) {
char *prefix = av_asprintf("%s/.frei0r-1/lib/", path); char *prefix = av_asprintf("%s/.frei0r-1/lib/", path);
if (!prefix) if (!prefix) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto home_path_end;
}
ret = load_path(ctx, &s->dl_handle, prefix, dl_name); ret = load_path(ctx, &s->dl_handle, prefix, dl_name);
av_free(prefix); av_free(prefix);
home_path_end:
freeenv_utf8(path);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }

Loading…
Cancel
Save