From patchwork Fri Jun 28 04:45:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50200 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp29505vqv; Thu, 27 Jun 2024 21:46:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXWQHdzZJOK/kzRsBy0/qC4KuHFcCnd8Ues6OIfdcv1OHGu9qcTqoTTz0+Z10rUWk7SVIAr5saP5qn+sG6XV0vvdmLWD0f9rnRs9g== X-Google-Smtp-Source: AGHT+IG8VSVhdmq88VkTyNdCwEapPLzQ5vTbD6sVExD9vGpUHqhvXmkHWenwrj6+GzrL7HEUuwkR X-Received: by 2002:a17:906:9d12:b0:a6f:b702:8a21 with SMTP id a640c23a62f3a-a7245cc04f8mr886953366b.63.1719550016893; Thu, 27 Jun 2024 21:46:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719550016; cv=none; d=google.com; s=arc-20160816; b=vPY2o0Mfi1CLpzXpyJS3Hnz4yGekDbokLTZ+4bWJBSekfvooDceTUyTF4sWn/49HJm bI1xw2gHl1GTWr9CMO2xxuujwHuDIBCZuYSxR55H4WpbbvG/XYUW+RvrEQzmbL8caVOp W7K5Jq0JCqtE/dJiI0gQTW9Z21rLR+Wg/HjIfUBsRi/4Bq1JErG5I2GMZ5RomBrUCbIp 1cBsAzMnB78BJSJYul8vbMQw5VfNFWUKsgevbrCmYEl6dZ3ZcWVXoHyhOStbCH0M9q/K tRZDUr4PXR/SNY9d33/hyk1cfBs6YPW7T2vDmZlF1p5t37kd3VqDVxU7IO/tQl8m6rhy 2Wew== 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=4aO+U1XqmIPZNqRrFbiCAs4Tl+LbGbfXOrGqy9HoXxE=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=r1JhjW9LUL2kMov/VaqNLnEDIZ8oUiY+py1R8wW4tFJTrOoedgSigMjuw//7KZnKq5 c6wH6aHyGd+zmlkWn9tPcKM+aux9yn7jucLlMes9rqsKQzLB28hR8/b8dxkDZGp0EmzP Jq22/3iLlmAaGXgQLDVMtNsFMgokZjIJb0VGBI3B3fzQY7iTWHbKVZmIFW0M7Y+mRh2B YoATi/EnqEL4XNGIn/tI0f6oH7bHzovwbc0lAgt8IFcE0WNBhhV8QHB7p5x12lNhfRjR UeX+Zho8+27eKx2ogtR4qebr4FvAQU3VIcpvNkA6UBIu4wgMqdqJhYLqu0UdqCB1pGZ5 oCpA==; 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=HMC+4uSB; 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-a72ab0751f5si41706866b.642.2024.06.27.21.46.47; Thu, 27 Jun 2024 21:46:56 -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=HMC+4uSB; 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 BBD4B68D63E; Fri, 28 Jun 2024 07:46:24 +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 334C568D5A9 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=1719549964; bh=3ShxWh9ROmSKQGYs/Wu8RuWFPoBAa/SYTC9xBs0SlXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HMC+4uSB4ksL5KasznLZbM9PQLQ7irUwUsCSaPlU8y8n6tSfXVQMZx+MawIG9MnjT mi6nga3LXNcjs7MTTU8jazItlbZyrETBK+8QfqZevNJEhcD3oNhnDFk1PZuEt/xa2y lobT/JHuiDNiNuWoxvVb74EJbGuP782fVskmLtvY= 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: xmsmtpt1719549963twwm1qqlj Message-ID: X-QQ-XMAILINFO: M/sBYxuwFsVoebDyCyEbqgHfSd/n07j5mm175AWns1QNQ0EF6AdiIKRMAChO/c P8sqxQcSVYetgMskeS2yZsbB6pJEoIr+CyafkEr5nEc7f7bqqUa3Nez7ZgTB2IIvnQB2hki4Eas1 neRKmHjbcT9CJv+jUlfteAexVH3sTIOliOpaBJc/YfKIRFY4YvJQknzrcMDahdGw0iBe0UByf8yJ oAd9esNyoq+YBAY6n8MD8xq8SY7VCOS40+x3j6Mt7LW3CDGACaKis8vIsiwrxIpK+VoAu5vEYWFt Yfmwf5m0jg2EkztTI2EcaWLqv9pO6Rp4bCGGgkV4PYi1NjjjZFmVjxdmxIoSo624H6pCt+qF46B6 DwVxynAgb2PdItMe1sgbpzvE0cNJEBNFJJflMvDPo1E2Y4s3kCji+unbsLWJnx/DyqEm2ldI9CZQ qRXIcgrq7SIRF2gpS3hgNZZRBVUhA/egSc7t3pJr+qoWOhZfjcrIw85HfaDBmGVGAGnvHmj5HZIl JyLH4FXbbg1HizMQXZF4F02mokKnGbDa+6sZptxmjVj0RtswCT7Tr27F1uEVn1z0B9hpEjt2eoom /x2xx1n1IlVq/USLQ9HAeB/IPk2S05AymcZ53etN9lNLsJsvNZFC0AkVMFmEZwH+Q/PQYtiOev93 XQuxfd7bomUh6657d65gNjJsiU5fsWVA+vkn0v/WH4G7qjI/XQ4a9xOsbT3/pVHgePilwjhuE9Dp ihiXmzWHzX7bCS3VIuIMqB88CWCs2kUTAjv8JEIklpKSAZMs8jW5VZAmIJ9ypxWTIR+IcH+XDxd4 o3gCLKGf/gFgfcFSDrX6jIGggB0SU3rlgAKagX1RBeOLMJAAWIXlmFeQLwr5WKoWOIQLu7a+xVxY 49SKwLdi5CNCJ7VQk09UP05qwrRZBF7S8jwcbvtegyyCfqAnEQm/PB2CdoSu1AxAD6xQ5KIY6+qh LbWBftvpaYiUinr9sxIM4q6lLduMg3aww2DEVcCcuUGQp/LdAcIbGWJ4JjnUWniUol79ug4BWn3P mZYty5Tw== X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Jun 2024 12:45:59 +0800 X-OQ-MSGID: <20240628044601.60376-2-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 1/2] avutil/file_open: Fix build error with wasi 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: lu0GgkG5to1U From: Zhao Zhili Don't assume tempnam is available when !HAVE_MKSTEMP. Check tempnam explicitly in configure. Signed-off-by: Zhao Zhili --- configure | 2 ++ libavutil/file_open.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 7685c95fbb..bd3c1d4838 100755 --- a/configure +++ b/configure @@ -2413,6 +2413,7 @@ SYSTEM_FUNCS=" sysconf sysctl sysctlbyname + tempnam usleep UTGetOSTypeFromString VirtualAlloc @@ -6548,6 +6549,7 @@ check_struct "sys/stat.h" "struct stat" st_mtim.tv_nsec -D_BSD_SOURCE check_func strerror_r check_func sysconf check_func sysctl +check_func tempnam check_func usleep check_func_headers conio.h kbhit diff --git a/libavutil/file_open.c b/libavutil/file_open.c index 24ef33e3da..eef6d83706 100644 --- a/libavutil/file_open.c +++ b/libavutil/file_open.c @@ -112,7 +112,7 @@ int avpriv_tempfile(const char *prefix, char **filename, int log_offset, void *l { FileLogContext file_log_ctx = { &file_log_ctx_class, log_offset, log_ctx }; int fd = -1; -#if !HAVE_MKSTEMP +#if HAVE_TEMPNAM void *ptr= tempnam(NULL, prefix); if(!ptr) ptr= tempnam(".", prefix); 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) {