From patchwork Fri Jun 28 04:46:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50201 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp29510vqv; Thu, 27 Jun 2024 21:46:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXXP7cUDUMeFwhZ+0hILf4kzJUglO/AHa0xH3OiIzHEqkQWQe7cqPhEEFFFweRzxbSlIC53/BGbBl5H+C0o7DyF6qGYo0uCHWnXPg== X-Google-Smtp-Source: AGHT+IHRmI2bCFiE2/5a9b8vSQMf8R0cMaPo5Q0UP3jAH0liTbuUho0n+sDdoTgx/zHD3p4S9iwk X-Received: by 2002:a17:907:118c:b0:a6f:c167:614e with SMTP id a640c23a62f3a-a7245b64c48mr1027560566b.31.1719550017239; Thu, 27 Jun 2024 21:46:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719550017; cv=none; d=google.com; s=arc-20160816; b=xDj4S3NzUp7WRRK5xGySBX9a+E6NH+EwAQ3nTtZCYAhPhpyYIl0FZMcdb+WNnwh+Xl hiK4Lo3igFZB32zvFbU6AtX/hfRV0g3/NPRfxOOPPhvWWBQQHX+oO+Jt0rG8GHQbp4i9 PR9bF+9jK7i0k4qMJrBQez+whWNSzxpLAOCnrTx0fmanR3ilC1JOTifHTEN4sX9NPIxK HsZGYZDO3d/RwTb/rbtWbmCavBRbRacCZhlTPpvmq4T7TyBwYg5aaVexayTeUt9wktR0 VbcTGFAMYNHkkqZwfTKe7a7XB7X/aOT3xMjwaIR/7CAgqA7QHQgZcGo4OVXnaNKRmFvn Babg== 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:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=V3+wr7YoO2cRTx2ROm3qcHpL2VZCIQa5gjPD/CYFINk=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=rKHIMpsAgjYx4oySlI6aAb7eSCW6g3niwlThFyM/88qzkNX+NXKyalDNVgW5wsORo8 dKlZBe6d67aTII0D3UXelIHjgCxD3+l2jBrBd3qJnBFG0V2Rs33W06VyaJyhuwT4eawk HnOjn9PG6C1uoKfNfxMQsZKj+fx+k4jTfSjcR4MqgEnmDYAM8nQ8lezYyWH17q8EERit ic3FsYHbFr0Cp94Qo6V1IgwWicord9xqw6BXlUYs4yTqOWHwB+8ZYRIVQd5RH1wKkQP2 lzso2j2PZgJRxqB3pecIwOJPQV7LmrQTaPhuL1XkaifZ1PE3fM5k2l3OdYxh2r8Ob3Z8 YLng==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=dbF0Kae1; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a72ab0969easi40357866b.817.2024.06.27.21.46.56; Thu, 27 Jun 2024 21:46:57 -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=@foxmail.com header.s=s201512 header.b=dbF0Kae1; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B2E6868D65F; Fri, 28 Jun 2024 07:46:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DDAB68D5B7 for ; Fri, 28 Jun 2024 07:46:13 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719549965; bh=wgNr696X8qe7EuloAFSgdBsN6+kR91vqFeP4QH4gfjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dbF0Kae1yg//CPRqP3XpGw8Qx81vHU4i5ePf4I5De9y0wLoPmJx/Q803jXCjxZotd JJZ6FS7LNIMF4b1/aUnfg7W+6BZ10Fxxt/98b6QhZe+ro3Nh9Wys3Wi8YwM09GED7E uFRizQ+aRRqnltVhnWOGQhXDgYcbjCGpDQ/7fFtk= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.207]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id B823745B; Fri, 28 Jun 2024 12:46:02 +0800 X-QQ-mid: xmsmtpt1719549964t4er8eseg Message-ID: X-QQ-XMAILINFO: M7n9VusxZAlPADRMYmc34PYymReiAm6SiWwWKPa46XTjlmzz/PTnRk3r77EqQH 7+9g/yKvaZYmEY2q96+8VFnH6CtE/lQI+RTjWIQuc1eIe9+KL2Nj/8HF5wNs0RCI6V/0sJae6dbM Ide9yA5h/DvhHK75q78KNsohaINaek0xnT9BIj0JwFCTp2Emu0nKx+MaynwuPpGmHU0HsNyQN28Q vgVxP3E4loIN27H8ILOoSh8Z/v+RmUjN8KiQezB5LMXvKqQegEaIJxIc9xd049atgoJvSZuePXh5 sTuxrBFCa9GS7Y/5WpwI99Z+NydRme/DTT8BZTd7BQ/cWpq4BzR5dI5d/jt//HKSWvjzdXeTc339 U1KuYpCUb8CJ0PmcD8NwfxBmPS/Rc7I+sNTi4sTpK8nCx7/NSm0iritoqqkn/9rVVxkNamCabWbn vgpPa+nwmB8U2lbxt2Pqy1hipTKNZBFB1agI7Nmt9fwr0DBb9cnLPdXi0o0g2lKOea2wg/vOuXQK cqjqgKcNlTUIJz00+rHX3i0sKs0mJzSuKJFD9+7lQhbs7xvOV1OCGDUrGCUnAL9aRVc65nk1T3Zl YKBH3OWUZu5CrBfXnLA7EYAjsySb54NW8hMEgbDzjFUji0pBDR8//Zb4ihb//sgv2lXL294n9Wwh mLHVQg9wjyuepVW8+JJnAcNGvcUIkS6xpzFLIi3LrQwU357ICCD2GzWWWKOMmSRB3ECwYpR8bV0y D+dVoiBsmMUOIjtKt7Hau90dLMSsCKkTKvlLCRlAHNy1xfaVcb/6PQ+imOdExE32giGPeObBYyun YbfQZS+tX2SkaYIv3knD1913dbtAWL+5jpdBH6+oam74VAiZWOwlLx3mm1gKyGQTactz2mywJcqV jkhB1QsUTM5EbsTbATxcEfPOY0FxzrToXdxvKHXSsgLAfRVb0wykrSvbw91GtRbSB6wvIVOEAHoR 9za38aa3G0JwMfTPWR8E3CYl5PD+evwxkqtHu0MfbPEPhIsMPqgw== X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Jun 2024 12:46:01 +0800 X-OQ-MSGID: <20240628044601.60376-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240628044601.60376-1-quinkblack@foxmail.com> References: <20240628044601.60376-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/file: guard fd_dup by FD_PROTOCOL or PIPE_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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eMhrvcUfhCUl From: Zhao Zhili fd_dup is unused when fd and pipe have been disabled. This also fix build error with wasi since 'dup' isn't available. Signed-off-by: Zhao Zhili --- libavformat/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/file.c b/libavformat/file.c index 3fc1e741f2..6a66040b65 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -193,6 +193,7 @@ static int file_check(URLContext *h, int mask) return ret; } +#if CONFIG_FD_PROTOCOL || CONFIG_PIPE_PROTOCOL static int fd_dup(URLContext *h, int oldfd) { int newfd; @@ -215,6 +216,7 @@ static int fd_dup(URLContext *h, int oldfd) #endif return newfd; } +#endif static int file_close(URLContext *h) {