From patchwork Sun Dec 11 15:17:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39678 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2945325pzb; Sun, 11 Dec 2022 07:18:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Gf+9SxCDyzTURHBFwjjA70s8es1Dl8Wev0JQ4Fje/RJfLLnKPCqJLfloheYM6OjmnJcYN X-Received: by 2002:a17:906:f747:b0:7c1:bb5:f296 with SMTP id jp7-20020a170906f74700b007c10bb5f296mr11416581ejb.57.1670771912156; Sun, 11 Dec 2022 07:18:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670771912; cv=none; d=google.com; s=arc-20160816; b=EDUFlSB6Nq0AbXcQvnotsaE47uhF7a+SoQPupcUIx+5OxgWoIeyP+mYqLlQNe/tr92 xvUpLO70+63rmItGI3oCWzLa2dSau6j3aB3ZTG+aCLVAkcqHYt5eW+mMu8F8l6zhOQcN w69gSRqahpcN0ZXK+9QyjRh3+JtiNn66pyhmmimckiJ+gfs0O4tsSjeVeDnhTAAvk8W5 Szk1BtwGMhYmxU261y1innjduPrqbcB7JdJL9EnKlvHv1yMa+hhxfKkVVdPVcP8X9dC6 t7ZYwL16gktvKHoivqv5N2dSR44E1Zt7lBrMUJ/qFWSEHXSb/MyiWow7m92iA/loxBtx ytmw== 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=LejcXYGuCo3UE2X2Ni/PjsxIVKTKPJ0ipY5JxLt00YI=; b=HG+EwdBEt/jCZXZq1Vp+Sq0/sqsJvrjo3GXKxB6lCNY5uOYwtTmpFhn5hOf+RkLDgb W1wklPmxEbLsiaFA4AHMt4Q+wpavnCtZHSGvr8UCAeEAIGGozwVWLrhtHrRCdwv8+YDa NsVoGTncFNgWtvYz1MxS3xzPDPkxTdU+r3eSzesPuERsk3IpH+1cjyiPHK5uexcohysx rWV6qNcC8zdsHv3z5LUdGtFwD/9pYHh+3aPjZsBwWQ9WuurJT+g9RVQXbEcDOgLjcfXI BXtwOcJv9UGj8ZQedN5ffrMl83J3zaIjSR69Wnjk6D69Q4Zu6NWsDPRun/U+OOk+/wMY C29Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=FJOmPD0p; 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 dt18-20020a170907729200b0077eca9fa444si3780959ejc.187.2022.12.11.07.18.31; Sun, 11 Dec 2022 07:18:32 -0800 (PST) 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=FJOmPD0p; 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 4B34F68BDE8; Sun, 11 Dec 2022 17:18:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-209.mail.qq.com (out203-205-221-209.mail.qq.com [203.205.221.209]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D84668BDF5 for ; Sun, 11 Dec 2022 17:18:02 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1670771876; bh=ZwpgJOQmGvytsysBieYS7BiWfMRe3t9PdN8fi13P2aE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FJOmPD0p7SfHRZv3DEtP9YTNUQsdSYcSXduMS15de8GKZwsi0MdQPZomtbbDMT7rO BDoindr0saCOYfBOfG90ZhxG3Kr0XivW4o1RPGTy2JMjKIOGjkN3Tl4PWGipCnxzhu erCcvHBzcf2Tl1H8WodX+Ry5zJdkI4TQGZqu7Kbw= Received: from localhost.localdomain ([113.116.30.206]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id 4762AC8A; Sun, 11 Dec 2022 23:17:54 +0800 X-QQ-mid: xmsmtpt1670771875tu1un3k8s Message-ID: X-QQ-XMAILINFO: M5WvXNp9ZPrQUB9NMOh6uzmr0fmEpy35zbohdi4DUZkVmpfSmw4PvzpddjLeUO y2vkRqZFWOYQpAYQe+6Tc00e8mxGA1lEp6hZ6VpONR94CyHPrO93hxbvNk3lSO4cpNPS4UBukxT3 VAyOYj2zZezEr2cIMhQ3Ma5NG2I24Er+ja4rALgGL39yhsyQf5SJBwEO2e9BQVws0j5i8JSkamn/ lcxmBQXJ3sZNSG2cc2R5fMsCvHFqqiWkjxGesZbNdn+IxSfYI428y/62txdGmWR/1VpTOIbccBYe om+nLc2GECi/TNDRweX4BgsjMal79C2NlvURdBp/B7MYv6ZoWCb40+mygDpNV+1WRVNvPm3k5j2a MdF0FyYtuaFxKeHZtycJ2oLY95DFT2zfx0QgOzk/YBNSvF2fcUe0TrFNdAg3Yr5D1WXayx/ufM3X ujF4XYl7TQzZZm+YKr8KrUoCLDMzhOXzvYTtmqz+UyymneXnwqxrA4ZfMcpYRthYzy6QvmKgDYgY eQ8Jcu1vh2JxW3F6yIxlxv8UE2iJ225VS0Mft61VGkyAsOq58bO+CVLInNUJJ8PLzqfMd8RBlnmC lkGEmQCOxVwwp7uSFtb/Sh213T4PWwEbcvvY9HkJBq+3T05ELqEF6pR5tNCpF97RMNIyKa+Q7Xeo JQWICuNiwJJo3hoo+1vGlzyRl2nyVYawobfrNY+eXxk/TkCEYpUR2WDNrbFtpbYm/W0Ax8cfsXxP YMGkeRi4P4Ov/5k+PnTmxKhfXTC3onfTumMLNnK0RUn1K1iPFeqQCf5BD0WBgGAzYJCr/PlWry2g PrpGh9TLQmdCcrdzP3hYNVawWW1icj0p3rx+urAJfPBcnAcamU0LMciqamx7G2rIsloZ+k7H2Kfa vorxH9SCH5nGQU5YgCW0N930hE6NOVkfTSZp7dm4T+8A9y+5xPXVy9vetu4JNEwAYBLL5CHaLPRe +hrX+eVoiqagy0jT5lfy3bzkevOoYw From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Dec 2022 23:17:29 +0800 X-OQ-MSGID: <20221211151729.120662-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221211151729.120662-1-quinkblack@foxmail.com> References: <20221211151729.120662-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] fftools/ffmpeg_demux: fix stdin interaction condition 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: a8b12NfvPsLN From: Zhao Zhili Disable stdin interaction for pipe and fd protocols only if the file descriptor is explicitly or implicitly setting to zero. --- fftools/ffmpeg_demux.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index e845e6784d..57695c25a3 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -885,7 +885,10 @@ int ifile_open(const OptionsContext *o, const char *filename) if (!strcmp(filename, "-")) filename = "pipe:"; - stdin_interaction &= strncmp(filename, "pipe:", 5) && + stdin_interaction &= strcmp(filename, "pipe:") && + strcmp(filename, "pipe:0") && + strcmp(filename, "fd:") && + strcmp(filename, "fd:0") && strcmp(filename, "/dev/stdin"); /* get default parameters from command line */