From patchwork Fri Oct 13 19:03:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kucera X-Patchwork-Id: 5559 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1026473jah; Fri, 13 Oct 2017 12:12:14 -0700 (PDT) X-Received: by 10.28.19.73 with SMTP id 70mr2130846wmt.87.1507921934094; Fri, 13 Oct 2017 12:12:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507921934; cv=none; d=google.com; s=arc-20160816; b=dEDFF5wG6DeXnRkmGGM1FA+iT6ZWxKui4GpDJzk7epR9TTtBBSyNFSZOyaU38Qycw+ 5GT12Wh9fw6fRrz821YSTdE1rvtr+9HJQ2xm1KrUb4jGXfjmMaV8c90G3yi9r5z/skc6 AgYh0xz96HIbRwRT6ACDwEYL4UF9Qqh8LIk7g/Xybrzbq9kbNG3U5Gv/TBA44IFIjALl uWBiDxYN9V6tw7ksJ1/6dzYUbILNwv1EIeJoG59KIwDz6sLgvwHxGfg6ZGg/R6aI5uel /WYTsqpdCNNx0jenpscS3N+IA0ZKwakv607KHo1NcUEv2iGJC2tAQbOWjSyZGjjBltg8 68TQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Ux16vJFY0/j1HU4cmFEnJtr0oEV5x5Dg97KLysxEl0E=; b=OqkHgZrVpCCiQzeRDFskmrlpP6/FvaO09vAbQuKxHe/I/j14bvLc4iN1fiZ++u8yFx lEZOVr9KGw4rEKBKylZBC+7mbKvbsyummt5uFGteNBgoKK/6B4y1qChglP5+RCoPEtQB VJ0LOP3tJBASU+LBvqQtQ8z//0fIgHt4nUONmztqOrQ4hYhxk0NnT8R6k0oqLZW+2tl3 BsJJ+wv1cHX59yRad8ZCo7rNCc8fs5Z+M+OSAGJ4RulC7E7HP2O/lVzobrK6cBdOqRYB pdzftSW0oyrbgUrloKqmRLzxa7wSIujwaJND0NLM+hil25+RFLgJvllodOYDLq0rWtvV +xHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Z878SGG6; 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 c127si1274403wme.250.2017.10.13.12.12.13; Fri, 13 Oct 2017 12:12: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 header.s=20161025 header.b=Z878SGG6; 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 4C94268A10B; Fri, 13 Oct 2017 22:12:09 +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 782EF689F49 for ; Fri, 13 Oct 2017 22:12:03 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id u138so23695993wmu.4 for ; Fri, 13 Oct 2017 12:12:07 -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:in-reply-to:references; bh=aVbGxduTPY3egeJsdMT13DVZIgcvSnyK1ryymZWmwQA=; b=Z878SGG6h9wqer9kfJXQQuXZnUpUd26s6G7w28EGgPYXJka4lgvCoHy76HH9xTusZ0 NL16Gxy2MVQQkdZpMUK2q/NjicZR1fo6PAzKPQdqmwd5NI4zl9KnscdDIgDXdkuIUz8b ZtBAqLTGP/nh7PDyoEXw46JCPtB3L/U6kDSJ9vRrL0Or4hXooSjq6hIdqKkfq6xmieEy MGa21sQ0cKC1EkWhWkWkZJOgerGI40g/nWVadI414PR8iH9UaPWWgmM+vk3KuLF+Y/N8 9OZlCG6g3lyqQOX1pkclfmgQCsPRnFjGjOVOGlT/vTxkTTyHkOj5+a98h7JfUlAKZC5F CsAw== 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:in-reply-to :references; bh=aVbGxduTPY3egeJsdMT13DVZIgcvSnyK1ryymZWmwQA=; b=OerIZnAPPJnLOSjH/hRg18LNjjmpgiuJqM/3IrNuFhfqc4QIkw0tkcq/7I+InPYjua 4AroKww9N2EdMOJyYuOvJF6W6as099PgLWkKVGd3oCgqlTKfMTihScbSrcc9OMBgVEGJ mBqvxkpYhqxAzGKkVLDbj08YNqt6su8TgketJpfuRRvIpUjyBJ8pp2NTM++s4vRgsw3w 22BbkhD0BvtVqt5Au7NkMHPtOJd5rVNR8e9PgtEihtX0ZJpW9udCyFCaYM/QUYANSuAN UCVwzP6/+7yMLscigEr4igxI6+5KwJM0iaLTqZu0VJ4BIeA2f67KmRIOGb0geSDoAN56 /dTA== X-Gm-Message-State: AMCzsaWpYT6Vs9NMyjaMo4Nc66Sx8fbKqSQAtGmJQQblfcTrhh6mYFXt WM/AdfRBPV42lEDhM9NaT7zzTA== X-Google-Smtp-Source: ABhQp+SdV0+hr3ZsqBeQ5HeFbvRgL3N+zoUoab5ywHR5tvLcFUGitrdwsYHoGokT6DBl5r3YxL9bGA== X-Received: by 10.28.29.68 with SMTP id d65mr2304778wmd.93.1507921441591; Fri, 13 Oct 2017 12:04:01 -0700 (PDT) Received: from speedy.danman.eu (mail.danman.eu. [185.98.208.20]) by smtp.gmail.com with ESMTPSA id p77sm2176890wmd.28.2017.10.13.12.04.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Oct 2017 12:04:01 -0700 (PDT) From: Daniel Kucera To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Oct 2017 21:03:48 +0200 Message-Id: <20171013190349.24112-2-daniel.kucera@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171013190349.24112-1-daniel.kucera@gmail.com> References: <20171013190349.24112-1-daniel.kucera@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] 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; }