From patchwork Mon Jun 5 19:18:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kucera X-Patchwork-Id: 3849 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp1504482vsk; Mon, 5 Jun 2017 12:18:39 -0700 (PDT) X-Received: by 10.28.9.138 with SMTP id 132mr9124138wmj.29.1496690318951; Mon, 05 Jun 2017 12:18:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496690318; cv=none; d=google.com; s=arc-20160816; b=ay5OoX6TwlhD1QoBGXsBhP+9RPjB4Qn9Vib5OPAupsNgeGb9VkUVY2hy4nR0n77p/F XdR2XAIh7uMfRHcP0SCERd5jr9B8v+oOUWyRbif8yLGqP1SLX48w713ODzGgOjSETUjl tHQiV10/FPuvS/hYyvmEWFdjNt6c4fmwGU+k6XSvHbVH1qlEPYjFwD7k5NjqnAZvpmTW jVbGrSBgfVaISUa22x0MQ4Rgr0iQr98a2RMJkqXV88hbcMRo+gMPnyE1FV8neElsot2O 0Wq2Dvx0onYpObWr5t7kJ3FlXme5y7g4qwGfN/nxQGySbPJQhlgkIswtY6jE0vljcZMe H21w== 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=Ux16vJFY0/j1HU4cmFEnJtr0oEV5x5Dg97KLysxEl0E=; b=vEnh0YwaEIhOJHQTeqy0ODvgviRAkeyVlcvLTWeyq90EtxRLx3GxpwB0ebG/2eJghO Kg57MVNwpaCur6q57mNNf5Wn60YIFKZgtquPkSFpb0e5Ph2Ld4xPExcFMXSlGJTQ5+vG k4fhEn9s+igek0YWQacN0nTboTUEh47DgKICGp4iH8qyzDTl8aabHi33PWnjukwC/pF9 gLQ6QmKzLQucig3Xf7iaapCl3gQVLv3DXBz/9yZlhBGNCoKWgkjdqiPK4YJe20GzoU2X FbANw5+URL49ps1+cZw9pU8g6F0I6T+aOXeozgn0KpQDHs2yyfr/Im8mgzqkp0k5Mh/z Gbgw== 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 r186si12956212wme.22.2017.06.05.12.18.38; Mon, 05 Jun 2017 12:18:38 -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 A5A04689DB4; Mon, 5 Jun 2017 22:18:28 +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 9E749689B4B for ; Mon, 5 Jun 2017 22:18:22 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id g15so31374070wmc.2 for ; Mon, 05 Jun 2017 12:18:29 -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=aVbGxduTPY3egeJsdMT13DVZIgcvSnyK1ryymZWmwQA=; b=dyCunBgNO+xjMdPjPhO0Yxy+oUr5A/O8L0jENyRAwvXDUfmctlh8VekgRNKvVzWjKA NhfgsSS8CKTJC4blTMABDulZb+53UnoOCPAXoyVSu3y4r1/YS3fI2OMyoCubw+/X0xem rzg0Z9NTAnB4nRtfWhFk50pO+/IGlwLTjaRIvL9TFr19PTtIgUqPlXuGW1+g9+PS8IHN UUtabWomt4zZI8Jf9CpeFMIyHbf5Hd261wYYZm15WaFkx3jb4khiBaWGNC8BzwyNtefl zhMdR5rz58fAfygGpUp8xh8bvoLtV3w8vD8xOCNWJmTKbGH42IawL9CXsSHiun7r/QOV xaSQ== 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=aVbGxduTPY3egeJsdMT13DVZIgcvSnyK1ryymZWmwQA=; b=TD0OFl+Btysz/YtLMurkFxc4QN0J0IR7eZ8Oxs55qcrPL4TcvTnx7NPWh2VUuRs7l5 0n2bECYlDHH5H18pEzuUzyKR8lpqFY/4sudQUyUnO8Ftc2OeUKG3dfE7vqKhKR9/PyUv oXGn1Je5XcDEuhZFaPPZktkVs61FWepAW8nsYlgW1dQUwcjS+Fw0WZDymj2OrVZBwY72 YW9hkEFrgfOXRaz5xfZnlkpiRZhynq6WXTdVMJHP77Gsat94VWt7fneOWMocLvk9p/yn Qzd1Mwp2Tlubj9fl9HJAB7O78jUkMW/Jndmz4DhE7GQ0FJioL8N0UobQQu0YRoprmhp4 2Dcw== X-Gm-Message-State: AODbwcBNwOSfYpa1FpFCsNAVcGe9o8Ul0yxoXpQ2zYUGvLaPXCrtQECc J3y3yPKTwrvY6m4ODhCYGA== X-Received: by 10.28.125.206 with SMTP id y197mr5142718wmc.124.1496690309035; Mon, 05 Jun 2017 12:18:29 -0700 (PDT) Received: from speedy.danman.eu ([2a06:cc0::5054:ff:febb:3523]) by smtp.gmail.com with ESMTPSA id a9sm55310109wrc.22.2017.06.05.12.18.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Jun 2017 12:18:28 -0700 (PDT) From: Daniel Kucera To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jun 2017 21:18:23 +0200 Message-Id: <20170605191823.17758-1-daniel.kucera@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] libavformat/cache: don't treat 0 as EOF 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/cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/cache.c b/libavformat/cache.c index 6aabca2e78..66bbbf54c9 100644 --- a/libavformat/cache.c +++ b/libavformat/cache.c @@ -201,7 +201,7 @@ static int cache_read(URLContext *h, unsigned char *buf, int size) } r = ffurl_read(c->inner, buf, size); - if (r == 0 && size>0) { + if (r == AVERROR_EOF && size>0) { c->is_true_eof = 1; av_assert0(c->end >= c->logical_pos); } @@ -263,7 +263,7 @@ resolve_eof: if (whence == SEEK_SET) size = FFMIN(sizeof(tmp), pos - c->logical_pos); ret = cache_read(h, tmp, size); - if (ret == 0 && whence == SEEK_END) { + if (ret == AVERROR_EOF && whence == SEEK_END) { av_assert0(c->is_true_eof); goto resolve_eof; }