From patchwork Tue Aug 10 16:25:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29396 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp595629iod; Tue, 10 Aug 2021 09:25:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwx106JSW4z6D6z3ci4os9JQeXlwVW4qIwFSJLEeuGTm2+Ek5QqWLjQZMY6ROxdJ+7MptC+ X-Received: by 2002:a17:907:7da5:: with SMTP id oz37mr27804711ejc.396.1628612721329; Tue, 10 Aug 2021 09:25:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628612721; cv=none; d=google.com; s=arc-20160816; b=AeqBnAvuTieY3/jhoxroDinnptaVRwXv+RdX7JiltQfwvGDxwpB5abQQoGYGk0No2W P5AfB7nBcqco5LDdKHQ9qVhlV3npbzhgc/bv4qc89vTme9M2sgF7fZfof/nB0gXJPs2I AkRXZSyvRBt+gem+G18YDQ3r0mhlwr4UZ4AAmYdBXEytOX9/Gl0JpPZ23YPW879j4l4X U+nrqvCdWm1g0NaAjE3rUecTU5QoiElh8g4mZoRk6DGjo9+vpLFJwTy7SB2XRAsA8mYe Z8+oQAXsbVO9LRWqOfiP/awKcDZT79g+MGfZI40X9v4cy4PgNzGL6g767jvyZJ6lvIG3 SnkQ== 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:to:from:date:dkim-signature :delivered-to; bh=bRrvPNOb2Dy4UjXCHqcyMxzceAV6TZWdauBZBx9pdWU=; b=M/v87EcMXh6Ci+k2OsT0IdbXxFqbwtdrA/P1U9AAHZoLhg3hAS8sgM0PhV9DMhvZmk ErY1tnW5DVqTWSyJlVAAtcXceZua3XLMhk+mg89SvVT3q1Sp9wV3VMZcqN2w7KvVt6r2 Uxh69Hl8sWjbeKYMXi0dBqhpZ/Ak12tDXpJQLTvPekAk12LThZ90F8CmPDFyDP0/z5lu vimrnPxLBbW383u00lcXquJNjNIZ46gEUSFEoJUdmpWz9iVGmXJhu9hIpYe86PEoTKKa b/zjUa9Vk3XDO8xmiHzoOrjGvcZuwpcHEZZRdZlD06V9Wv7dTFXvnGQxKOQ5EFr2Cl07 d93g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="eN/+n5Gf"; 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 cr15si4416795ejc.668.2021.08.10.09.25.20; Tue, 10 Aug 2021 09:25:21 -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="eN/+n5Gf"; 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 B2E4268A369; Tue, 10 Aug 2021 19:25:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99C2C680371 for ; Tue, 10 Aug 2021 19:25:09 +0300 (EEST) Received: by mail-lj1-f182.google.com with SMTP id m9so29996357ljp.7 for ; Tue, 10 Aug 2021 09:25:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:date:from:to:message-id; bh=2bV/T/ykPWgEqwWW3yDQOmdDzlGJ4EUUKwWLypIhu2o=; b=eN/+n5GfXDFZBQ742WbrvZvpMCvMqTGPCfqR5Kc9JCGOgr7TdJX5bDLTlpxqM0TuLI U7xG3PZwcDQX4rmX5FyFdZa7Qq9D3dWZaWOeukBvBgt7zLhOGdQozsQL/RSAQHMhrB9P 3ImpkdnyaEpebtcfjO1Cs213T2ypkBpHbFCl0rAzAsyqu6vb/sfRDwqHMjUSiazHZ3rQ vNVxFZzbI1X/3hF+vjybSMh7sRnBEVonw5yhdo9PWwI6OhdqmJmWrxt6XUCkxC9CvjPL IUnJv7QdlJFh4zezAlbigBaU4niM4ZKZl8QYEv1upWy6kB6nz06C9r9Pl1Msl1bxcg+n blQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:from:to:message-id; bh=2bV/T/ykPWgEqwWW3yDQOmdDzlGJ4EUUKwWLypIhu2o=; b=moaNowYUHyyS6wfXt7QhXzAEDwrNGxZYH1tyFCa3/XMxQ99w5nYN99ab48TlZLKSFy XnatdDsSMpn7hvcAoswjvYVMMxMyljpJQTOU1jqmOwwN5qXRbzdXOAr01ZVqbtn4SLYS qlspA6K4tSm7MpKFGndzmcz7Ipz7r0Iq37zvaRZMj9KQUGY6kalnK5zNwBZEX9FejT4+ nnBDKsBorHTDUDb8IIhJivE3ZZ5pmSqzTFk6uz7ciUuGKpuicX4qBghshdU0b7JKZtm0 VBm9kxYWq3CjWkDitq3XW8A6alnbs7cU4E9ijmKncla8QF0RaNWa+w+GEXAFLUsEK9go EXug== X-Gm-Message-State: AOAM533QM+LojOAK1cbWNr5jIb80bH7yAqT0r4DRy2fcbsI6ZDkDadpr AhZM3xqjAb3srq1N1o10UtpT9llFsSw9JUi6 X-Received: by 2002:a2e:93c4:: with SMTP id p4mr20205054ljh.38.1628612708393; Tue, 10 Aug 2021 09:25:08 -0700 (PDT) Received: from gmail.com (onion.xor.sc. [185.56.80.65]) by smtp.gmail.com with ESMTPSA id y17sm2090282lfh.246.2021.08.10.09.25.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 09:25:07 -0700 (PDT) Date: Tue, 10 Aug 2021 16:25:00 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: <7f437b2af4e643dfbc804484e36d998a@gmail.com> Subject: [FFmpeg-devel] [PATCH] libavformat/file.c: 'file_delete()' and 'file_move()' require 'CONFIG_FILE_PROTOCOL' 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zXtW5Pv3y6kB This quashes 2 warnings when the 'file' protocol is not enabled. --- libavformat/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/file.c b/libavformat/file.c index 8303436be0..9c23f680cd 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -167,6 +167,8 @@ static int file_check(URLContext *h, int mask) return ret; } +#if CONFIG_FILE_PROTOCOL + static int file_delete(URLContext *h) { #if HAVE_UNISTD_H @@ -203,8 +205,6 @@ static int file_move(URLContext *h_src, URLContext *h_dst) return 0; } -#if CONFIG_FILE_PROTOCOL - static int file_open(URLContext *h, const char *filename, int flags) { FileContext *c = h->priv_data;