From patchwork Sat May 7 17:39:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35680 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2252637pzb; Sat, 7 May 2022 10:39:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9cnQxzLvQKW4iFHmt+dGXvArBODoYK7urpZkhIpNB10yGiSVoUfGFwplP3qWg/4F3YqR6 X-Received: by 2002:a05:6402:4414:b0:419:28bc:55dc with SMTP id y20-20020a056402441400b0041928bc55dcmr9678419eda.130.1651945171682; Sat, 07 May 2022 10:39:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651945171; cv=none; d=google.com; s=arc-20160816; b=aEvi2/WKxie+WaCqENZFi0fm8DlUZorQHwjn3d04QKSLFMwu9jiyj/pkxO03DaOM42 ASZCRfsArpw/IRmvknjiihvl8RbfIMd3HNj5GP4xilRsDFxuuZvAsE1FFo+tBliA/O2z 6i+JyPJtOl9cxi9kDty5HaEwW3i5FZtXYKKwrVKuolHqrLcjcae8wYFZseTxpRq43Irm qFjXfCoVbRRJ7jUWqU0dtOr1GRiiqra6Q/3r79cn4JgRYqKnW7ews44eTDJ2ybxrhA0Y btJMahL4U/Ce9Jcul2JfWP5uxEjUfCgnlC20XJ2vmX+lgmst6djFZrTziICb6CAbrWnQ F2/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=HELo86LJGHBQIlPwh9m1nA4fYmH6PR5QkXa9qaJVp5s=; b=Gvn+EFSrakXDMmjCUuwcSmc2SqKkDLcALJ8XYPvlU+05bPMvKMc7/HYljG0Rt6UcCb ELsxZyMGloTCwG/LGT8KmjGIRgeqVmMAYcr0lyTllenE/o8jmJ/wuWQYDBnOK0g6pMzF uWXTWf9F6NSsqt1PcyBFqJg6LIZILff4r43kjMOWSpe/URj9gUnYPvnqofiBPVQi7YUr JoJ1JPdg83C1D4H82Bt5zn/HlEDH6RthNzOW5cO4try7BPnNCMJk0zltJSZdWbHquuhx NUrtWq2FaPRMYqvRdD+Z1VhIaWf183hgdfHe/+IUSyBNjRMUTuPjC+SHV21jArg0cDep Bjsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RGUTctQd; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ot11-20020a170906cccb00b006df76385e6csi7849826ejb.780.2022.05.07.10.39.31; Sat, 07 May 2022 10:39:31 -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=@gmail.com header.s=20210112 header.b=RGUTctQd; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D54D68B3D2; Sat, 7 May 2022 20:39:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1ED168B3B2 for ; Sat, 7 May 2022 20:39:13 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id fv2so9700000pjb.4 for ; Sat, 07 May 2022 10:39:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=vdyPMlufTuHr38yGC6cjeoalDswgwLgJxGKJEpA3fQc=; b=RGUTctQdKYnIeJtM6i/Sy7kTYdAF8keyEKrlKc6ym+iWcZYVKFOOKm3nHZCTnFea+Z ngRPJbcsGxTmz8fvKXFnifXbYw7SzZy6QAB22nrRzbBqCaDnc1DBVoFN2CTsxsEaBVBB jo6AQGyKPFE7HZtnC6y79wVQn88kkpIz+b938Ff78yTFoB1n+PritlJGs4kD3v8u/Wkb hLGSRGGjH6Z+P/sq179k1kXqM2tcxYagsM/m+f8I9/GbeCMgT+ezcrQqRnML2fN12LTX PvfJu/xLfRWAR+V/8o9jD4Hjwoaq80N4yziFgnXeCYIvd2JZxEhiSisW5vLTDd6z+J3+ 5gOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=vdyPMlufTuHr38yGC6cjeoalDswgwLgJxGKJEpA3fQc=; b=XwO0COyQ6WdgmmH7iM7Yh0YOYxhsU9+3EaIDiXSPh7mkFmUZ8eiPs46GV0NSVEGyIU atvvdGmJBsmVyaO7DC4pkiGavRqlZQqwsBdCD0Z1JHOfQqciX5ezkqMRsdbGsyZXg6UO Y6a5icfjwXRwsM/B4+KL3Sbpv6z+Zb+af5o2YMuhh5Oh5lz6ptgnlGi3R7CBoNoX2MfQ 9Mc38YE3oGBO8DxXoUgXnDYqbELHifpOVSedXAt68FK++iRyA1MX3FrNa+CH2cJnwn5u Y7Ph4YnOTxk/6DX3za6EvUjsSSl0YG8hw+zZwH1U5z7mozBSvaNavYaPMDCLZdxLficG H0jw== X-Gm-Message-State: AOAM533qqHwO1aXsWErjuBYCj8SfpakBdEsNJoYBctslpZ9FCxWC9AdN OwvH8fatAzmSXbcTLQtcAEKnZ/jg8S3yeg== X-Received: by 2002:a17:90a:9914:b0:1db:d10f:1fcf with SMTP id b20-20020a17090a991400b001dbd10f1fcfmr18342206pjp.241.1651945152224; Sat, 07 May 2022 10:39:12 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id k70-20020a638449000000b003c6445e2aa8sm3552657pgd.4.2022.05.07.10.39.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 May 2022 10:39:11 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <5802c8526c48ceecf775ce49ffcac0e15b8981c3.1651945149.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sat, 07 May 2022 17:39:08 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/2] fftools: use av_fopen_utf8() instead of plain fopen() 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 Cc: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3NQp5ObRwcnt From: softworkz Signed-off-by: softworkz --- fftools/cmdutils.c | 6 +++--- fftools/ffmpeg.c | 4 ++-- fftools/opt_common.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 5d7cdc3e10..ca3a4c267a 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -818,7 +818,7 @@ FILE *get_preset_file(char *filename, size_t filename_size, if (is_path) { av_strlcpy(filename, preset_name, filename_size); - f = fopen(filename, "r"); + f = av_fopen_utf8(filename, "r"); } else { #if HAVE_GETMODULEHANDLE && defined(_WIN32) char datadir[MAX_PATH], *ls; @@ -842,13 +842,13 @@ FILE *get_preset_file(char *filename, size_t filename_size, continue; snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", preset_name); - f = fopen(filename, "r"); + f = av_fopen_utf8(filename, "r"); if (!f && codec_name) { snprintf(filename, filename_size, "%s%s/%s-%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", codec_name, preset_name); - f = fopen(filename, "r"); + f = av_fopen_utf8(filename, "r"); } } } diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a85ed18b08..a9bd4a790f 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1261,9 +1261,9 @@ static void do_video_stats(OutputStream *ost, int frame_size) /* this is executed just the first time do_video_stats is called */ if (!vstats_file) { - vstats_file = fopen(vstats_filename, "w"); + vstats_file = av_fopen_utf8(vstats_filename, "w"); if (!vstats_file) { - perror("fopen"); + perror("av_fopen_utf8"); exit_program(1); } } diff --git a/fftools/opt_common.c b/fftools/opt_common.c index c303db4d09..dda199d412 100644 --- a/fftools/opt_common.c +++ b/fftools/opt_common.c @@ -1178,7 +1178,7 @@ int init_report(const char *env, FILE **file) if (!envlevel) report_file_level = FFMAX(report_file_level, prog_loglevel); - report_file = fopen(filename.str, "w"); + report_file = av_fopen_utf8(filename.str, "w"); if (!report_file) { int ret = AVERROR(errno); av_log(NULL, AV_LOG_ERROR, "Failed to open report \"%s\": %s\n",