From patchwork Wed Jun 15 19:51:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36242 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp552611pzb; Wed, 15 Jun 2022 12:51:52 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s1FdoCSFuVpnXDO2e6UtzjICxtTAXK1JkLyFjhW2nN0+nIdsPPUzj+EiHINe8LOfHC8yqX X-Received: by 2002:a05:6402:1f0d:b0:435:1ff1:9a48 with SMTP id b13-20020a0564021f0d00b004351ff19a48mr1835251edb.270.1655322712078; Wed, 15 Jun 2022 12:51:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655322712; cv=none; d=google.com; s=arc-20160816; b=w8oK56Il5Fj5EuTFQgfdx8DEvcJt0jdnyw5JFgYZClHPJBITesEMDPdJMqnkaogvl1 SoajV66Bt0t9Rubud07aG5EZXt9RkVIadHb/ZGE0cWlHGWcW4Lop5mXQmk8hLbCJTNIF PI9zX+n1lJ1EApr3xJxbnO1rdeCSGfUs7FzFPlNBdGQfr/p6DgnxLwLVNSR13wwHywqm ttYrqBjtGcxMiwvsCLwXs+eAmGQ+CkzcS5wCAnl446/jDWRaDenqS5w836wTfeBLxt8x rGRoZiqGK1TmKfDi7dq5nKZY+7Ci+/cRdo6jBZc8rmLeKFOvvlkDlayXmjBFgOTE+Hn0 w2IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=wck5Gh3tZJ45YiVREwz/p0oiAQ/bs6B/1JICiOazkZ8=; b=QzPe8iOqVqqIdQdVgF2Bx2AbOzSZn5ZOUpS0Fuyjx5dO77pRhTBXyFN75HXY8wsAru bSUI5cppOVRwik8Za/IdMg/cNNV+/DC3mHmtzFjsOje7yfmlE+wZ5LU5ej+a4xcLyV8+ Um42WIwbV4UsNpVgBO1IG8c3K6mTBLJbNeK1RqA/Z9ZF8Rmbhj+KzSL7OOoa175LR7lh Y+Zc7L3sc64yuZU7JQfimDrsI3/rt+aFRm8g8wBl/Q954siynUOdPelI8fwe2/YuOFat yy9sYyU06anFHLiXpudxjz07QcstFbE+nw9yvrh5Sz4xV1YWZHZdSoDVGtH84b2XlSJ+ kY7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=TD+Wkc6e; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 10-20020a170906024a00b00711610f8ebfsi14805171ejl.185.2022.06.15.12.51.50; Wed, 15 Jun 2022 12:51:52 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=TD+Wkc6e; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E2BB768B6E1; Wed, 15 Jun 2022 22:51:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-6.mailo.com (ip-16.mailobj.net [213.182.54.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB30668B679 for ; Wed, 15 Jun 2022 22:51:40 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1655322699; bh=p9jxFt4rVMw7lLn6uKQfLHnRCrr8GugwXB91pqjkC1Q=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=TD+Wkc6euXFNcDFSdkI3q3SHM3Xg/rZODTcyi/dB95h0GeC6aMcOH8iPCBreFcvkP J4k3OLmrqNCOzs4Ktr/wRK9CqXnhqTR9PuAWn7AZQkboux4RkNJl+Pgg8rRBOhLWdn gQ9IT3MqrQwvcNcRhPDhoUZXNdnzkTwWKJNmt+hM= Received: by b-4.in.mailobj.net [192.168.90.14] with ESMTP via ip-206.mailobj.net [213.182.55.206] Wed, 15 Jun 2022 21:51:39 +0200 (CEST) X-EA-Auth: P5DeovZlf/VBLwo1pVDRefi3YvAMqRcpYbcgRtHsyrj9LuBo5HxzGlehXZRJLP7Hmw72T8ubHEgGqx8LNqdz/IG47eHcY2JNni2sxcv6Cqw= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Jun 2022 22:51:28 +0300 Message-Id: <20220615195128.15796-5-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220615195128.15796-1-nil-admirari@mailo.com> References: <20220615195128.15796-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v15 5/5] libavfilter/vf_frei0r.c: Use UTF-8 version of getenv() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YEIwoN6Zw79L --- libavfilter/vf_frei0r.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index f11ae6e55c..727e96561a 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -31,6 +31,7 @@ #include "libavutil/avstring.h" #include "libavutil/common.h" #include "libavutil/eval.h" +#include "libavutil/getenv_utf8.h" #include "libavutil/imgutils.h" #include "libavutil/internal.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 */ - if ((path = av_strdup(getenv("FREI0R_PATH")))) { + if ((path = getenv_utf8("FREI0R_PATH"))) { #ifdef _WIN32 const char *separator = ";"; #else @@ -231,12 +232,17 @@ static av_cold int frei0r_init(AVFilterContext *ctx, if (ret < 0) 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); - if (!prefix) - return AVERROR(ENOMEM); + if (!prefix) { + ret = AVERROR(ENOMEM); + goto home_path_end; + } ret = load_path(ctx, &s->dl_handle, prefix, dl_name); av_free(prefix); + + home_path_end: + av_free(path); if (ret < 0) return ret; }