From patchwork Fri May 20 21:12:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 35858 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:906:4548:b0:6fe:2728:7bda with SMTP id s8csp1436493ejq; Fri, 20 May 2022 14:13:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUyixWNSiilsJ0208W9IscrTUYEc7lTvGV/wbbCNT2sk7Ll1fd2w2e4k0u6mM7uCZKAB7V X-Received: by 2002:a05:6402:6d0:b0:42a:9597:9e4a with SMTP id n16-20020a05640206d000b0042a95979e4amr12566876edy.147.1653081209709; Fri, 20 May 2022 14:13:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653081209; cv=none; d=google.com; s=arc-20160816; b=iRKwq91cf+miYyO93v1mBWEfTAYaf/SAVORJyzF4osTEciXY9AWSbbmNDbsD5zEudP gzJfBzPlhLA5vfacS0gz8ZvPHw65PpMpiKcymX75o4XZvgl/AVOfz02Ft07jngf/m91k zS6Yee7Ql24zbDffKyVAS2pg+Cd6mglKKyY53fsFLRzLjj9xJ7/Th9cKanB91vgh+TG/ zzVSX4CQkxpG1U0MGNtsLB3xEDUcXUieW56RF2A6xZbUxaybcIbuUJ7S8bg4mQ9JLYsI v7C9+6vPnTlpFWTdAxA5Zba97meTvYQhRUOMDk4BsMUMpPbFB8cApIrpevyebrGKO4hf 0gRw== 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=OHurGlEATusc7bGxrz/LAhI0St7kywTxFyefQ7DIsNc=; b=v0VJIQSVAqjr4Uwd/Kci4REpNJrbAqYHmmHZxSz6OT4CKYcv7aZUZEyF1zIcSDz2mf g7D5S7MdRz7zMJoPz+UFMAxC3eLqqNZNBz20LH/xAuPMQtXGsPhVtnWggTTD3TK29lsF /w7iI1LV+FPD1IGYsWTEZHMTVGQVV9b2jo9nsLw3czVYCbVHNNIwWncxq/G/yiAxuMCM iO2XyuCjE1WHvjw4RgvjdAWLLKDTcCkbVN8JFs28YaueIrJ8hZwGjJ1xxfZn7nlqHGKY 2l2MI+C7I/nzDZZ7xGC+2e463JqTSvowO587Kvmt5NlgE1DasVwFXYS6Ii9o4J7rZ8lr hl0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=y10mSOo9; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bc12-20020a056402204c00b0042aa68f763asi8577066edb.595.2022.05.20.14.13.24; Fri, 20 May 2022 14:13:29 -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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=y10mSOo9; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6909568B4BF; Sat, 21 May 2022 00:13:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFF4568AF9F for ; Sat, 21 May 2022 00:12:59 +0300 (EEST) Received: by mail-wm1-f54.google.com with SMTP id p189so5150527wmp.3 for ; Fri, 20 May 2022 14:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=inOeI2Vhzrj2wXDQoXJjSGnxkwFt0t1xZgBufqo0XSs=; b=y10mSOo9pUCS6+HJv94W1r+Mu6TfAEhNK5T0KkSqTwO2BxvpjLuJhCUZJmbYcHk1ge 0wAyF8A8e1XqyubO268Ms8IjqC7QbkawMK5ysQYNuAXptiKMrLjkiRwxDfctSYm4DLCZ 2h6Wyr9xCrs3KtqKVvQDlapT73u1Zxgz60X11yvSXsbEkeRgyms7zhgXW8rk/6Nqjy4Y 3mZFg5guGfFpgMjeZUV5OrRNsKA4QU2jeAnSzp8W3tmy5T+dop3ivzCnf0jg8Npfu3VN 3NfLYPB0cAy+H6ZJDMXtorq+KRMeI6mHp+T/JRD/NT7Ikae+K3wWLJcUZGavN84xgqQF 8dJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=inOeI2Vhzrj2wXDQoXJjSGnxkwFt0t1xZgBufqo0XSs=; b=0nHHEyXXHS729vZRp5WK2Ll4CqRxqgCu2eltzz3TCqOcwVaH9GuU+EY2kNh2GOdOn+ UxMvBsRxhobDVOTzW4z/wTbyNz0zNNfIKZCPkbjrMWCOP0QI6L5DDShdt+Or1Z9j1wZ9 0dc6escw7cPuC/hOS1EIJoDOGIlTzt6EMebT4stJaM5p+6frIAGLTSE1dQZv7iBCqqB+ 966HqJzGMBDUCQ94x/m5RfRhnNVPRb/1+3i9EheWY+go0Hm1INcs8/inY9xr0OyfQbZp X2wgHWvaP9bjEZEh6CLmlYqVM1yugFbY8iNdq6vJ2mQIZ+a2777IZY0HwXKiaR4cLG7N S6cg== X-Gm-Message-State: AOAM532wHgnLpsa+JugowSlbHiqkaOl5KKJIayPP65CQ/65hMLikOmNz d1x1nisGNiPNFlc00UomG1DXgW0zVm1uw/HE X-Received: by 2002:a05:600c:2055:b0:397:2b06:57c7 with SMTP id p21-20020a05600c205500b003972b0657c7mr10378960wmg.97.1653081179127; Fri, 20 May 2022 14:12:59 -0700 (PDT) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id h3-20020adfa4c3000000b0020e609dd274sm3359707wrb.76.2022.05.20.14.12.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 20 May 2022 14:12:58 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 May 2022 00:12:54 +0300 Message-Id: <20220520211254.47116-3-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220520211254.47116-1-martin@martin.st> References: <20220520211254.47116-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] Switch uses of av_fopen_utf8 to avpriv_fopen_utf8 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: av7+DlLq/60w --- libavfilter/af_arnndn.c | 2 +- libavfilter/opencl.c | 2 +- libavfilter/vf_curves.c | 2 +- libavfilter/vf_dnn_classify.c | 2 +- libavfilter/vf_dnn_detect.c | 2 +- libavfilter/vf_fieldhint.c | 2 +- libavfilter/vf_lut3d.c | 4 ++-- libavfilter/vf_nnedi.c | 2 +- libavfilter/vf_paletteuse.c | 2 +- libavformat/ipfsgateway.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavfilter/af_arnndn.c b/libavfilter/af_arnndn.c index fe562e81a1..5e3403ca6a 100644 --- a/libavfilter/af_arnndn.c +++ b/libavfilter/af_arnndn.c @@ -1478,7 +1478,7 @@ static int open_model(AVFilterContext *ctx, RNNModel **model) if (!s->model_name) return AVERROR(EINVAL); - f = av_fopen_utf8(s->model_name, "r"); + f = avpriv_fopen_utf8(s->model_name, "r"); if (!f) { av_log(ctx, AV_LOG_ERROR, "Failed to open model file: %s\n", s->model_name); return AVERROR(EINVAL); diff --git a/libavfilter/opencl.c b/libavfilter/opencl.c index 70d5edb78c..c8e7e6e1a5 100644 --- a/libavfilter/opencl.c +++ b/libavfilter/opencl.c @@ -210,7 +210,7 @@ int ff_opencl_filter_load_program_from_file(AVFilterContext *avctx, const char *src_const; int err; - file = av_fopen_utf8(filename, "r"); + file = avpriv_fopen_utf8(filename, "r"); if (!file) { av_log(avctx, AV_LOG_ERROR, "Unable to open program " "source file \"%s\".\n", filename); diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c index 22a1f8aa70..82e2753f01 100644 --- a/libavfilter/vf_curves.c +++ b/libavfilter/vf_curves.c @@ -416,7 +416,7 @@ static int dump_curves(const char *fname, uint16_t *graph[NB_COMP + 1], AVBPrint buf; const double scale = 1. / (lut_size - 1); static const char * const colors[] = { "red", "green", "blue", "#404040", }; - FILE *f = av_fopen_utf8(fname, "w"); + FILE *f = avpriv_fopen_utf8(fname, "w"); av_assert0(FF_ARRAY_ELEMS(colors) == NB_COMP + 1); diff --git a/libavfilter/vf_dnn_classify.c b/libavfilter/vf_dnn_classify.c index c612ba8e80..852f5ddcee 100644 --- a/libavfilter/vf_dnn_classify.c +++ b/libavfilter/vf_dnn_classify.c @@ -131,7 +131,7 @@ static int read_classify_label_file(AVFilterContext *context) FILE *file; DnnClassifyContext *ctx = context->priv; - file = av_fopen_utf8(ctx->labels_filename, "r"); + file = avpriv_fopen_utf8(ctx->labels_filename, "r"); if (!file){ av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename); return AVERROR(EINVAL); diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index dd4507250f..68bd2cd0c3 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -244,7 +244,7 @@ static int read_detect_label_file(AVFilterContext *context) FILE *file; DnnDetectContext *ctx = context->priv; - file = av_fopen_utf8(ctx->labels_filename, "r"); + file = avpriv_fopen_utf8(ctx->labels_filename, "r"); if (!file){ av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename); return AVERROR(EINVAL); diff --git a/libavfilter/vf_fieldhint.c b/libavfilter/vf_fieldhint.c index e7afac1116..e6061c6d3c 100644 --- a/libavfilter/vf_fieldhint.c +++ b/libavfilter/vf_fieldhint.c @@ -73,7 +73,7 @@ static av_cold int init(AVFilterContext *ctx) av_log(ctx, AV_LOG_ERROR, "Hint file must be set.\n"); return AVERROR(EINVAL); } - s->hint = av_fopen_utf8(s->hint_file_str, "r"); + s->hint = avpriv_fopen_utf8(s->hint_file_str, "r"); if (!s->hint) { ret = AVERROR(errno); av_log(ctx, AV_LOG_ERROR, "%s: %s\n", s->hint_file_str, av_err2str(ret)); diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index a5190b6688..c7ecb7018e 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -1243,7 +1243,7 @@ static av_cold int lut3d_init(AVFilterContext *ctx) return set_identity_matrix(ctx, 32); } - f = av_fopen_utf8(lut3d->file, "r"); + f = avpriv_fopen_utf8(lut3d->file, "r"); if (!f) { ret = AVERROR(errno); av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut3d->file, av_err2str(ret)); @@ -2134,7 +2134,7 @@ static av_cold int lut1d_init(AVFilterContext *ctx) return 0; } - f = av_fopen_utf8(lut1d->file, "r"); + f = avpriv_fopen_utf8(lut1d->file, "r"); if (!f) { ret = AVERROR(errno); av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut1d->file, av_err2str(ret)); diff --git a/libavfilter/vf_nnedi.c b/libavfilter/vf_nnedi.c index 370f643678..e5a16918bd 100644 --- a/libavfilter/vf_nnedi.c +++ b/libavfilter/vf_nnedi.c @@ -957,7 +957,7 @@ static av_cold int init(AVFilterContext *ctx) size_t bytes_read; int ret = 0; - weights_file = av_fopen_utf8(s->weights_file, "rb"); + weights_file = avpriv_fopen_utf8(s->weights_file, "rb"); if (!weights_file) { av_log(ctx, AV_LOG_ERROR, "No weights file provided, aborting!\n"); return AVERROR(EINVAL); diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index e57882a64c..5c491a290c 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -538,7 +538,7 @@ static void disp_node(AVBPrint *buf, static int disp_tree(const struct color_node *node, const char *fname) { AVBPrint buf; - FILE *f = av_fopen_utf8(fname, "w"); + FILE *f = avpriv_fopen_utf8(fname, "w"); if (!f) { int ret = AVERROR(errno); diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c index 9b0d3dea59..83d52293b4 100644 --- a/libavformat/ipfsgateway.c +++ b/libavformat/ipfsgateway.c @@ -139,7 +139,7 @@ static int populate_ipfs_gateway(URLContext *h) } // Get the contents of the gateway file. - gateway_file = av_fopen_utf8(ipfs_gateway_file, "r"); + gateway_file = avpriv_fopen_utf8(ipfs_gateway_file, "r"); if (!gateway_file) { av_log(h, AV_LOG_WARNING, "The IPFS gateway file (full uri: %s) doesn't exist. "