From patchwork Sat Oct 21 03:24:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takayuki 'January June' Suwa X-Patchwork-Id: 5634 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp4448337jah; Fri, 20 Oct 2017 20:52:56 -0700 (PDT) X-Received: by 10.28.143.130 with SMTP id r124mr591079wmd.122.1508557976816; Fri, 20 Oct 2017 20:52:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508557976; cv=none; d=google.com; s=arc-20160816; b=FlDmt1uNYkb1zNH89URhyI9e5S9LmAV1ibMJJs+8JXs08yHxxUNj8tD9hem2+H8gGy +AhQRGyTjyEEVFjyeq+wkz/p2r0rTWcvKoVQsdsHK1PDqxga1pxiu18z1+rOI5UPbXq4 9OE9cCOFeJt/MkbWv1UYoEt8ohfyhKgbxn45yAkgoZCY+TDofHHX1kvDgAIvjdHpcf6P B6V4GOXVfqo1g2rWK6WB4YSgyKP2r7gdyH+jps32DiptEZTjsfF7NOi4hb23q/eO77pW I3bD6ZluFpFQUW+6Bh58kKPZDqDNzOQWeM0n6eWERcdgoMaIJjBF7b8SK+6wdT1JzJcD DQCQ== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=fHF/B6uiYIjomkr0Lwvc5hk8J0tK2hh/RG0VM8o8Nk8=; b=lou9yBdemYXaYvA/4t0nKV0C7hqydNn+AP7IfA3n4RUfB9oDQDBCAwG1yL7K/Ia12J R3xARe685PnhHFV934DwD4NT2kdxamhDwhxG7EEKNr08n1ZiDYJq1W36OlWnfDb0lcVw aDGR1Wo1Ov5RgZ1CnAn2wb6yYiriTvlPuAJlrJ0j2n4HtPFqNVSm6df+j+pCezC8xN4j ZpGktlVpwsr1rXjzk1XsIHFlo69CU/yGPi1SZ5MoyRI/f5GWJmbhh+pZOLaqNJf3ZmIK 1ju4Q07gZJa3vY8mORhSq6IQm8S7ON90neDRmw+cJHaEOAMWmcGyPmCiSKWcYBpi0Gtc x2Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=O6CF0Cfj; 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=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 64si135289wmx.202.2017.10.20.20.52.55; Fri, 20 Oct 2017 20:52: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=@gmail.com header.s=20161025 header.b=O6CF0Cfj; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E3D7689723; Sat, 21 Oct 2017 06:52:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 598596882E5 for ; Sat, 21 Oct 2017 06:52:41 +0300 (EEST) Received: by mail-pf0-f194.google.com with SMTP id n14so13435294pfh.8 for ; Fri, 20 Oct 2017 20:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9T7yYelRk6ikDAvXjlNCpuyh3qjwqQKNYNbraRlLrkI=; b=O6CF0Cfjn/1k6+bYHkVRW3GLLWO2W0rh53LOncBvOibbNbEnrAmr1OVIHjzHyi1dlq Vm76Yr6u9lxImfSOk039jDpKki+7unN4qGYA/KCPTmAWgZf5oGqn2yiw8N4ZNbjABGmY xFsrc/Kp64LLbsEd5eydnn8Yr3skRqANQ0yUcaj0gV1uPH27aK9XneC44LMS+aOjcvlH zF/3YXGDZ53aHnfsA8HxVZaT2SVh+GwyW2h9GRj6/opiaSh3asBW6jI9vH/ihzEMp8Zq bbVElg47gDuxF07QsBfoey4bX7AZeo36pu/kqYwj0lBOgEB1wX3uOxiZBNZtS/kMRf8u ZPBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9T7yYelRk6ikDAvXjlNCpuyh3qjwqQKNYNbraRlLrkI=; b=YTiRIDfOuLGM64mRv19Ag4uTfhzchaOL6jtNpTpref+D/RxyhMyj6DJz2hwmFc1cUD /FgFZReJ2+ODcyOBCE3PsmwY/czxUGU11iykErNF2n8FCj4wV9kwCqFcMs66H9Crhesn XzsYUAdIoSHtUSx0Zzl3Zd8fFUlYChmmwAU7bXYNYL7EqYj4xRAdZMsmnQXHoDeukyL6 fDFVnlc8eYVRAQykeUR1XZE5KnBToSAuPuAe/2I5kJ0oy67UBRvhTRtXtX7p8ivr9rat Tn6Y+vQExq9TqQEysY+ResnAJg9g3gfrR2VxUlgeUOkShs46u5Om6o2T9JFYwoffYZ5W HxGw== X-Gm-Message-State: AMCzsaVr5QRLmxeo7OO0suAVOXjTemhg2sHYZzMspN0XabDqrHLoc/d7 qs1Gybt8G9T7cPbvaKJD8/DLLg== X-Google-Smtp-Source: ABhQp+SOPpfMqZ6SwGuVkv9VjlWwgsSaPK2OS56A6Dbjat8u89eN5IHCd5+ntbMeKI6wtD5aOIWOMA== X-Received: by 10.99.103.68 with SMTP id b65mr6256458pgc.271.1508556287446; Fri, 20 Oct 2017 20:24:47 -0700 (PDT) Received: from localhost.localdomain (h175-177-005-154.catv02.itscom.jp. [175.177.5.154]) by smtp.gmail.com with ESMTPSA id h29sm3701133pfd.65.2017.10.20.20.24.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Oct 2017 20:24:46 -0700 (PDT) From: Takayuki 'January June' Suwa To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Oct 2017 12:24:40 +0900 Message-Id: <1508556280-27888-1-git-send-email-jjsuwa.sys3175@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [FFmpeg-devel] [PATCH] lavf/tcp: return EOF on read, but not 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: Takayuki 'January June' Suwa MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" related to commit '858db4b01fa2b55ee55056c033054ca54ac9b0fd'. --- libavformat/tcp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 07b4ed9..5438122 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -220,7 +220,12 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size) return ret; } ret = recv(s->fd, buf, size, 0); - return ret < 0 ? ff_neterrno() : ret; + if (ret < 0) + return ff_neterrno(); + else if (ret == 0) + return AVERROR_EOF; + else + return ret; } static int tcp_write(URLContext *h, const uint8_t *buf, int size)