From patchwork Fri Feb 16 06:54:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Patagar, Ravindra" X-Patchwork-Id: 7609 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp358467jai; Thu, 15 Feb 2018 22:54:41 -0800 (PST) X-Google-Smtp-Source: AH8x227uATksykqAewBCctNvHfzOgbdr5oihmiJBrXQwt8Ird7e4MT7oP5yQLs67oEUIX1bedsOm X-Received: by 10.28.28.139 with SMTP id c133mr3663444wmc.144.1518764081331; Thu, 15 Feb 2018 22:54:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518764081; cv=none; d=google.com; s=arc-20160816; b=VINdp6lBTH0Tq9kfZTqgj7XFU56fMBfCFhgPnlkII6iGs8ZdCcPMLYRTWwTFZHZrqr VodniuYsPXV7AXfNI6HbSoyAA/jnzsScpEOIiT0kjfveOqLkMsZMQr28o0+tRzf/GPAf GaCHCXxr24qUAwtCVDUBciovlBfWP8cpN1oonLjzMWoFIGXgDu0PA6GoNrybgsY5eRCf O4YpbABxWcOu0+XiK8EWTsBCtLdF1VOeeOpdMfgVAOKnus555s732uhsGMquhupeNyB+ UKhLyjOroRVHvTUZ8qNG3VzXReafnEXo1DLO+IZq/kPVqvdEVXr8guklexowSe/F8w4t r8oA== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=QF2TpjVXbc/B53AdfASHfyXZDXmYUso0yDAcw5YLIpg=; b=EfOUiv4SmU93eFf8i3JawYGNsCJD3SHXIsSxeJzjfn5F08tH+rHixU55jReghsezd2 tK67JC5wiCFuaDRmeC22xc6itjSLQTpHQRiGk8Lj57+amMIQJ2uzSFolUwx+ScEVW0Ce ktVem79RB8o3ggnuY5Y+TLGZQyG8dg5qj353Zp1VdxuFHpaBFbklGnoFvhgEmUsutsUb uHiDlbOideE+sjNlN/lpMhKOTmUdOBgYfihLLjNrF+v3g3kunyGCyCfbKEimIGjcgkcH /zh0cqm1+z18yvJxvR1NWaESEAub94sbQDCuu/9Mv9RV8LuIzM7o34eN9yjJIwYhPm1o bTWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=RIgxWzPd; 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=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c184si9493846wmh.117.2018.02.15.22.54.40; Thu, 15 Feb 2018 22:54:41 -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=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=RIgxWzPd; 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=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 40F6F689F79; Fri, 16 Feb 2018 08:54:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (a2i831.smtp2go.com [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B160689D80 for ; Fri, 16 Feb 2018 08:54:19 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1518764977; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=tdGZn8LePVMLmhPd8wSRJegchaipyaOxPqs7S4UfUvw=; b=RIgxWzPd FSkk1MVSdmXNgbabayz24doO+9Dg8bl82FbB0GR4SnUrBJlpci2sjq4h2Prk6lbkKe7qViUpQFKYF QuLeTAlUCwuL2dIw/d8q5dqqxiApiOr3Yz/We+ZmhWJdZmKlS2fLikdhfiyhWrBkIkoHI7BsE3SSL DvTzs1hFaCTdhqh3oERzwtniKY/nYf6R9xy5imkTL45N/svXKVNMvMY+/IoOLnV1MrA+q1wmdo05y nM4l9zsK+C+QbcEwEY3ihQNGaTkgx2hp45qZDZ4VnBUbBAGWnM5U8x7eRmn6Z8HIoG0JG0aSxC52a Em9aCD6LP9g831g/dzSKPzZ+ow==; From: rpatagar@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Feb 2018 12:24:09 +0530 Message-Id: <1518764049-6256-1-git-send-email-rpatagar@akamai.com> X-Mailer: git-send-email 1.9.1 X-Smtpcorp-Track: 1-XZIPDIId6ajo.hsjgr-6AA Feedback-ID: 337386m:337386asVRLGB:337386sL_sdUq6d_:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH] libavformat/network: Fixed wait timeout functionality to exit immediately when timeout is 0. 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 Cc: Ravindra MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Ravindra Signed-off-by: Ravindra --- libavformat/network.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/network.c b/libavformat/network.c index d5c82e9..542bd3e 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -85,7 +85,9 @@ int ff_network_wait_fd_timeout(int fd, int write, int64_t timeout, AVIOInterrupt ret = ff_network_wait_fd(fd, write); if (ret != AVERROR(EAGAIN)) return ret; - if (timeout > 0) { + if (!timeout) { + return AVERROR(ETIMEDOUT); + } else if (timeout > 0) { if (!wait_start) wait_start = av_gettime_relative(); else if (av_gettime_relative() - wait_start > timeout)