From patchwork Mon Jun 5 18:32:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kucera X-Patchwork-Id: 3846 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp1486650vsk; Mon, 5 Jun 2017 11:33:13 -0700 (PDT) X-Received: by 10.28.50.65 with SMTP id y62mr9279716wmy.5.1496687593300; Mon, 05 Jun 2017 11:33:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496687593; cv=none; d=google.com; s=arc-20160816; b=xmDaRUvHc4WCgiv5LLx/QwNw2fxlr+r6EiKw5WTO+C9EfdupaqrIBS/0KbSqPf/eHC TpzhJeax/Vfb3hVg6RVIqezIL9M55DWKcaBNJx+tINZYV90bkYLstJE4mgB9PrESqqqC m1heJIqLGUtCr4/dMGN5eUHaToMEQWRybiQ9y9xKVB8Zwi3sOeauo3SPvlkvuf3R8t+o PXdcY38fmAp1wjGvwfKAAxY7NDf8e6DhDpHNMNrz7Mi7++2XGj/W1QKQljPWzV84rXVk kLR+NIgrnXOYBJb6ZlEM8aCh7lXDeADH0Bw+0lGcnnN09a17MakLn3M7AfPUcKMaOsax MPpA== 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=rjwnS0Lx/i2iNolGeyqwzY8I5NRnkvkecjurzea5zFg=; b=DUsDQZ9yCWAltE8RNFeQ/s08TACsRnFcxfoMwnA46WsxZLaBD+7LulgIQ6SapdKIG2 rD3btp2z2TmKeFh/eD58BzUDCvKYVSn7+Kezv6UNt2gLPIHHeFaIblP25TInNxaCy/F6 izmDEE/TPNgzkrlUeJ8DdSNjE902+fNfOXii8Y5k/0KRZITgVpdzob9y7iIBRM4jVYna dPOx3560z0rYKuuaJpg3Od3t4y9F0AQQgsLh2cnN6k7TlB9HD8Ef4RuKbLQcoHtW6Q9a n5exDdae3CkhrqgtWpxCjUvvrBBGiy9ud1DO2Rvk5Qn/C4rtVA+sAZX8F2h2V7cERxCD ajCA== 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 v15si6372849wra.112.2017.06.05.11.33.12; Mon, 05 Jun 2017 11:33:13 -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 5CC14689DAA; Mon, 5 Jun 2017 21:33:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 316A1689D04 for ; Mon, 5 Jun 2017 21:32:57 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id u101so5756800wrc.1 for ; Mon, 05 Jun 2017 11:33: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=5FEdkMX2FhfQkTfYnqo0hf3sbamrfnUeGFO52mS+Mz4=; b=sYkz6p5KIQdbXhRR5suf3N7K8bqWPTF91US8Pc091/2vSBT2E1XEfhHxF4hrZomtpp 5M6KMP24KXNEEBb7SLhXgbvWHPZfWkw/yrbarrb5Q3+SspEwlAJg0pbaEYlqQB1bBrBr 2PslgPcEr+LsZFp5zYVOA23paCq7Q/6Z0ZyLVITiIwFu5vxfKFH73ykzpLvg3UqDkyu1 9TmzrjokppORNywR37oFuuPnaDmJ6nYfshzxLrxBY5DX9lEL7k/FyfyykWQCGjZLER2G /StxRDeY9Q8Ng/Z5gAF/b2vlP164MbrGuFRcczzei8o3aybftcr/r2QIdSprjcp1g3ek axpg== 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=5FEdkMX2FhfQkTfYnqo0hf3sbamrfnUeGFO52mS+Mz4=; b=B6I2BTLpZV4pMNVNWpvUEFzwbxk6mSxcH+Y5Ib8BJhKd5l9vVvm2As1OjmSu15k94v 9zQoH4fDL9KXmc6isxbMUfzzJFso7vUUVBSppnlMTuH9+BF2Br07tdCDHgHMa/uHq7wK P7OMgMr6QNlgBC/THZftxd3NautJyeDcqekU1RYibUcerQ6mnQI1khNvif8vlfTilZMx MRMpnHJDo9qvMBgwG6tS5NitmTIHiKdHM8KEA/8p8Ke2uINvldOeQoX9nwqbX0HelYhZ S5BiY9tVojG7ZvqyrWPYEgVTV9y+m2lpz+VmtubdgQ8aCSZvPt7GOsGQsjv/oBMPkW0B e+ug== X-Gm-Message-State: AODbwcA+6wsnlItT2O5YGF5+vrNJv2xp3hELTJGAs/Kf04LCCTA9nG4L /UJQXuBGfIPdYrCg X-Received: by 10.223.166.13 with SMTP id k13mr17056501wrc.197.1496687583623; Mon, 05 Jun 2017 11:33:03 -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 h73sm1473747wme.18.2017.06.05.11.33.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Jun 2017 11:33:02 -0700 (PDT) From: Daniel Kucera To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jun 2017 20:32:39 +0200 Message-Id: <20170605183239.18806-1-daniel.kucera@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] libavformat/subfile: return AVERROR_EOF on 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/subfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/subfile.c b/libavformat/subfile.c index fa971e1902..497cf85211 100644 --- a/libavformat/subfile.c +++ b/libavformat/subfile.c @@ -102,7 +102,7 @@ static int subfile_read(URLContext *h, unsigned char *buf, int size) int ret; if (rest <= 0) - return 0; + return AVERROR_EOF; size = FFMIN(size, rest); ret = ffurl_read(c->h, buf, size); if (ret >= 0)