From patchwork Mon Jun 5 18:43:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kucera X-Patchwork-Id: 3848 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp1490398vsk; Mon, 5 Jun 2017 11:44:14 -0700 (PDT) X-Received: by 10.223.151.134 with SMTP id s6mr12339279wrb.40.1496688254072; Mon, 05 Jun 2017 11:44:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496688254; cv=none; d=google.com; s=arc-20160816; b=iFy8vk0339zxlIGoOsFu/Jm1X+NyZxAmMKljjCUh4/Y0UlPLrULAci0DGHHgFmfgtY W1CMpsp/mRPC+WH0qMMTjhzVw/NVgjxJTVM7QOqwynUiakVsUgI0YMWkHshO8QFqyja4 Op1GAHpygQn3bZ8G3M9l74qed3SwKyQH95H6UMRLu1ZWe7/UO61BGG8SDdBYEJapabWZ NjPnZwIfRv5gQHKw7XM9zyCOGIFyHlndbK2pbwIe50mrxbadAxtuNxh5JXnQ7D72PJq2 nVGZ1N2JzkXL8rXdgd4DRv/TigghoIjqTpapTAb05DBMRI+WXD4qL8Pit2xnMOEM9sjl EkBw== 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=S44R0/p5ru7UXvP8K22uUa8KxvAr+eBjcNMZ+O/wnHc=; b=mORrFKpjW8ef8u+rj3kuhXvHHLNErHAY/eYBk1HR1V2x7RUYdcEWLhZCzzsiKhAu2h ROwSL4qjPZQMlc07usBqT8m7XOBOlbT9p/kYdQoUcjGtjraDml0FNezb05SwV4yQadgx n6HDiG699FqyMUEjdf95dBDocVA/hXr6lTX83tfmevWJjykUtxTbGGAxZAYzM+X4qqxG YsW4uPX4v1BeZKw76tQ7QPVdcqsFPbG2dRqTx1xxB3EkSrrlrb3s3dR1/YTMSvE/sbb9 2vudW2P18vCZonsBwahPKsdzgjgs2NyHWADrteDTOtTe/VfPdcU4Q31A/McyEsRY74Jb dGmg== 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 7si35087042wrl.88.2017.06.05.11.44.13; Mon, 05 Jun 2017 11:44:14 -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 2169F689DB2; Mon, 5 Jun 2017 21:44:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3B2F689BCD for ; Mon, 5 Jun 2017 21:43:57 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id k15so31285693wmh.3 for ; Mon, 05 Jun 2017 11:44:04 -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=ClAdEq3HbtJUqQL3SIiUTE6GuAndJKXgL6eAiHRjVM0=; b=CMS5K4Lv2SO9eyk4/1JQFjFaPLb+EuWpJ38EiXKvVsTd12/xqJQsnoHC3RYYIQO/b+ Akv9VDwpWVLSwXpK5KVsmMdKQVVjUKIl34a4os2N6vXYOxpvs9VRGlvDDvJUrEbulRoL 0vEEXIumLHM60imnLd3z86uIZ6x8P7RAsSbNu2Pbeb8xN1+2KVLpPrbm2DSUvb45vq7W eANhaIfo7l924vesELOdnao/lKQe8UyEkfzts+X0r3hXpPtQrsxwZc8woE6CVyWJB4BI 9bHWnU5NqcVwePrA3hXCm3dnNCGEa0W1/RsFNIxbU0cCOWOALCmK9gynBZxIPH7G4onp IrNw== 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=ClAdEq3HbtJUqQL3SIiUTE6GuAndJKXgL6eAiHRjVM0=; b=cQ3t3/bVPQMkaZYP7BkPygKBYNI7PDfbluyQP/wEWrbytRNaI2GLOC50yEK0y89j7g hrMoDccrStNHT0czfaTenJ9Iucz9kTwYOpTxQRDW3YEdUpsDu+26COPv2VDK/QADDAvX +rdYseXhFDxsMIok9vJocwhi+iIEXqBwjFujzCCDvb1vCztrTkq8FhwGeHFXQ/7cB57q muyJQ9GwMYfTqQftrbA8NUJJvWpwRBmbLypkZh0FXdCM09YUcxlamGyaZD3Kiw/TP0hC AZ2eneXDfAemu5j9RayVqhIaY9231YoJmLSbj9CC8bsYhRHaISLeJ8jpSLh+HV9ILrF6 C6Jw== X-Gm-Message-State: AODbwcBN327je/nSTR2FR/O+XbIIsWzwaLOGXryFL9qTSMYl3WPxNvEe iEdpQZSsYh7tsUAJ X-Received: by 10.28.132.66 with SMTP id g63mr8470116wmd.59.1496688244088; Mon, 05 Jun 2017 11:44:04 -0700 (PDT) Received: from localhost.localdomain (ip-89-177-134-12.net.upcbroadband.cz. [89.177.134.12]) by smtp.gmail.com with ESMTPSA id 9sm12477498wmh.17.2017.06.05.11.44.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Jun 2017 11:44:03 -0700 (PDT) From: Daniel Kucera To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jun 2017 20:43:56 +0200 Message-Id: <20170605184356.19100-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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 1e79c9dd5c..909cad564f 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -394,7 +394,7 @@ 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; + return ret; if (ret) { fast_retries = FFMAX(fast_retries, 2); wait_since = 0;