From patchwork Fri Jun 9 13:51:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kucera X-Patchwork-Id: 3889 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.150.149 with SMTP id e21csp1615897vsh; Fri, 9 Jun 2017 06:51:51 -0700 (PDT) X-Received: by 10.223.169.120 with SMTP id u111mr23556175wrc.203.1497016309827; Fri, 09 Jun 2017 06:51:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497016309; cv=none; d=google.com; s=arc-20160816; b=dKNhbYUxYEuARDVXre7NUkzi+bzqaauZVAA+/0bVivoVq0APSku4iEyZKilLNLclQw hqT8lGuRAIgW/8XmYpMH3TlTnB24szBP5x+3whU3ADREEYpiOaPKqt2sE31xVulHHiln sXPNU98KwllDL5/GX12Z2PBNDJGUhxR34dnci7a9qI2Fh5rTTFxPKRyCU4tLByEewbed 9W4x96vShbW+8TYrnVRPYsWHKrfbWblVwyBhTrl6dVeJ3VdzGzQtUycKyVYgBfsCSvq3 P32r+7hV/uH/eoSeT7a5LqWSoW4k+jZbpR4DHE9Q/0HPywErqBkSnPN2jx+LUVPLKUBX GRBw== 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=harXwFQVa40JgHKwKzTIPCc7RPsG3/u6WgoFXsmx1Ho=; b=OOFZl9WwzRLNrgDOPiUG62E+G8knje0+6J5/LbjifvojQwm0e057VngRJrai10v/d8 49DMLk2016T+GBAB+k2cm520teZFnwgQplWT1dpkZF6L58USBLkuouMWndfkcjb6YaW6 YLrlZc3DZXmRmoVPajR+4rkbST/CzXWyzrjG/3XsmsT/SkdJtN5+Lfs3+6pvDpuwOLiG 2/AIwTQhdhnRepjSU3cWHI2+MZqNloPMRoM2T654hF1RPSjKw26nxwXnsoWgodYUHo0K DK7ee9668XMl9w5iuLxm4f/p3F9G5IX76xcXJHhfKFieLlR+aUqnAy8juzX+HPCGsSIH CGJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; 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 h19si2104005wme.113.2017.06.09.06.51.44; Fri, 09 Jun 2017 06:51:49 -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; 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 3FC58689E89; Fri, 9 Jun 2017 16:51:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5A2D688363 for ; Fri, 9 Jun 2017 16:51:34 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id v104so6967842wrb.0 for ; Fri, 09 Jun 2017 06:51:35 -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=6XOqRVWnAYOzUFvuOpzA6wa5nFbpxCcztGuPuRCGInM=; b=lBc//gTkG+efAfySrx+m5TLntMm6H+x7kHuKCiL/z6ZLOVggiDqBuOcqNUjqCDQjfe yRwMG0FuTahAXJE/VzTUTVP5Nj82rah+Au90ix+Hh2d/TI6G75sz3jCXHC1VZOc8lUJf W2LDOijmvgNP4eOvCz0kNep8fS0bKJRofCmFQJQXU0TqGlDP1O7juw0xX8OQSNz5RJPv wxqXz/kcJ03Fb39m7l9pQq9wjIYYD+7hSznHbDyuHJ9+Rp4zXENRf3SZ+l6/uDeJjZX2 BtWZdgr7vzX6fcDG/CpFn99wutqI2Kx+GpKedXPv1ePRyKss4OyjbnRI695m/OoPtTS2 GK9w== 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=6XOqRVWnAYOzUFvuOpzA6wa5nFbpxCcztGuPuRCGInM=; b=JO9NZCFNoWb6mtCmO7e5HX7RFTJ5n8/rmplVlP8wjfDpZwXNPcHQcz9gQkHllbGbet /vEjueEwoS+XB+dIEUUwh0bug0dQjqkhH+5agxsyWLxc6rHNAsHCtkvdZgHDlZPHgWYy m6VKuDf2OAcN8Qf4y2xeMGYYpwfggkdTZdjbwsEENxyr/9mRTim6vgyR9vAPk6OL9ZLv Pick20WLl4U7HRQymSsmaVrvxM5ZbGNwqYqWi73/mNHaGp5xPMvPpuHV5BxnloBBINnx bWjb7m04Q00YZRTLf7Ho5uQhO9QUjQKefcYESVthHHjYo0DIToqETp8L8gInyzu9P60p GhfQ== X-Gm-Message-State: AODbwcBfoM92lxDkGPSsx/JA/KbtyFz+HCTQ02q9x4JZOcnvT45TShCR S7heElSp7I3IcsyA X-Received: by 10.28.207.133 with SMTP id f127mr7308118wmg.84.1497016295029; Fri, 09 Jun 2017 06:51:35 -0700 (PDT) Received: from speedy.danman.eu ([2a06:cc0::5054:ff:febb:3523]) by smtp.gmail.com with ESMTPSA id b201sm2636231wme.2.2017.06.09.06.51.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jun 2017 06:51:34 -0700 (PDT) From: Daniel Kucera To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Jun 2017 15:51:30 +0200 Message-Id: <20170609135130.18470-1-daniel.kucera@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] libavformat/avio: fix retry_transfer_wrapper return value on error 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: Daniel Kucera MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Daniel Kucera --- libavformat/avio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 1e79c9dd5c..d0cee42c39 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -393,8 +393,10 @@ static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, } av_usleep(1000); } - } else if (ret < 1) - return (ret < 0 && ret != AVERROR_EOF) ? ret : len; + } else if (ret == AVERROR_EOF) + return len; + else if (ret < 0) + return ret; if (ret) { fast_retries = FFMAX(fast_retries, 2); wait_since = 0;