From patchwork Tue May 8 15:27:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 8873 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4153348jad; Tue, 8 May 2018 08:32:53 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrgm+NI9fyIYRYkbSSXtuqzYmY8txhXX2QRJjBjVOJjnLdw9VB9Hd9xFhDokXru0IvDykhM X-Received: by 2002:adf:a58a:: with SMTP id g10-v6mr10911245wrc.233.1525793573684; Tue, 08 May 2018 08:32:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525793573; cv=none; d=google.com; s=arc-20160816; b=Z8FibgxtL2C3E54ZCJlSyCVjzOo7CSJx7XzPGUi85gFr0mBRO1lwx4QkO+mx2W/L9E kqQqpYOlgb09NiOFEGpEP81LDY2pKzY1iVNH1nMWHAY26+KxiZqyBu72yYyCzZo8hbfw MKI5l/jx4Vhu+NvXX5yD7YSYXkmmqh9fFaxeVyCj7CQNTIDx6sG8NNrNteAmUWYbGnO+ NHb0La11QH3OIwV4MRS2AZWB7Kc5GRE+D9MuO8PgLVrBjMXu71CITY2/ToytNDSiUAb7 Hwi5BJUdhrn3nRYLW9Wmm/s+ZZzNyTF9WcR+Kf2WQwtQzuujRh86qxBk/mOyzt4WEwT6 L2GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=Zd2zwchosRWdcr/M0od2tlYAFXn61JZl3ifDOjmlqo4=; b=OY7+fWs8rorqBTZZy1QSgy/9kJW1Elt0s5I112iKA8GIE/krm7eUfoeq6Lr5/KJSit fTi2oBl03YuiWr5ja8H9ZTU+CFcG2pzLY4xy3WdGib07HolUcBVaWss0a1XkZa5GbM3K nnKCGXNrpQ01UcIhGwmdV5KpNxm3OJDw2l5AVkQM3vCHF8/QK9RP0kyi7GuTtB7TrtuN C0q4lkniL6wgWd4EuVJWCM1IARqWIiX7nfd6sGoS1lp36ljjUs8L5ZT/Q+rD40ewObUr od2ubB/1kguGGytyplgDfQbBC3OvIjB7gshlXnGGuPh75teh28sqIT6BuE5hJWD1Sn78 8Uyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ozjC5+Uq; 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 i15-v6si1703312wrh.62.2018.05.08.08.32.53; Tue, 08 May 2018 08:32:53 -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=20161025 header.b=ozjC5+Uq; 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 CAB9568A72A; Tue, 8 May 2018 18:32:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A591680671 for ; Tue, 8 May 2018 18:32:10 +0300 (EEST) Received: by mail-wm0-f51.google.com with SMTP id f6so19562156wmc.4 for ; Tue, 08 May 2018 08:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=CBXS4gHufI1MzV8dMPNGR5eftNzY0KpV7Uz65+5sd40=; b=ozjC5+UqYZ+E52Ux9p2Xr3cmf+r0CUzK0qM0nvF97FXOW90+xOEWPVSvYjf20CkBZp BJhbfYRgPuYW9DLsWPOuEdxBAhtWFAKHHC4IF2PZBdFHoip/fhkvpHl+xXJRr3Iu5yXq OW95486wev4pYeRXg3ocTaryLfCfSv5lzdbxJXrT+0t+1VFOV+eQH8MBOKiZiexMcvWG E69PH7+UkwCtJHh573vuRUmG4IXxhNRwJzTiSYBzDK5X5CnaDTmMmIERGkk8coKwURjt gQUYS1pye1Bqyl+1lMGlH6qIpAyMLbGi5Ex1+BjYMeG3L7kCE1chl9uVnvXjq3lV9UC7 VwuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=CBXS4gHufI1MzV8dMPNGR5eftNzY0KpV7Uz65+5sd40=; b=IEE0D2LKrGLGzumHrP1Ww9AHzKdmHrSVZk0SXBTOERWDYwqbIzu3Zm63s1OuRYEvg8 kDgfQCCNvz94x74apmTtReD1/k18N4KNQEyJaq5JDYk6ujHQUR8+zqOuBBqgWdyKC3Bw k1g6QNKpr5PDx8Sx2Kh5sD9k87cTb4izCY6SRl4QodQlyxXVlR9Rk7twgtn8uhd1M35o bNgfZlPLOd2ldriavXFbF+ZQ5+UVA8BLxHax5VSGO+4Yxdx4CkZxgzVzLF3+h5dBYnW/ 05BFeM3QCkKQ3bnVpougMw+PMKEoJShqceQp1AWuMH+ZhM0tW6Zen82zrRvQNEFUwYTM 9zuA== X-Gm-Message-State: ALKqPwcfad15ejqOUZtYFKPniXhxqX96nQBWlq0jrMD6JjMk6ExuyHCU LmaI5N/ylx+TiiTH6rXu6VrV2mbE X-Received: by 10.28.234.206 with SMTP id g75mr3551457wmi.76.1525793247527; Tue, 08 May 2018 08:27:27 -0700 (PDT) Received: from localhost (p4FC4F2DE.dip0.t-ipconnect.de. [79.196.242.222]) by smtp.gmail.com with ESMTPSA id 44-v6sm34803846wrv.47.2018.05.08.08.27.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 08:27:26 -0700 (PDT) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 May 2018 17:27:28 +0200 Message-Id: <20180508152728.7176-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.17.0.windows.1 Subject: [FFmpeg-devel] [PATCH] lavfi/vf_srcnn: use avio_check instead of access X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The filter uses avio for file access already, and avio_check is portable. Fixes trac #7192. --- libavfilter/vf_srcnn.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavfilter/vf_srcnn.c b/libavfilter/vf_srcnn.c index dace2b99b5..edffebb278 100644 --- a/libavfilter/vf_srcnn.c +++ b/libavfilter/vf_srcnn.c @@ -28,9 +28,6 @@ #include "formats.h" #include "internal.h" #include "libavutil/opt.h" -#if HAVE_UNISTD_H -#include -#endif #include "vf_srcnn.h" #include "libavformat/avio.h" @@ -145,7 +142,7 @@ static av_cold int init(AVFilterContext* context) srcnn_context->conv3.size = 5; CHECK_ALLOCATION(allocate_copy_conv_data(&srcnn_context->conv3, conv3_kernel, conv3_biases), ) } - else if (access(srcnn_context->config_file_path, R_OK) != -1){ + else if (avio_check(srcnn_context->config_file_path, AVIO_FLAG_READ) > 0){ if (avio_open(&config_file_context, srcnn_context->config_file_path, AVIO_FLAG_READ) < 0){ av_log(context, AV_LOG_ERROR, "failed to open configuration file\n"); return AVERROR(EIO);