From patchwork Sun May 6 14:19:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 8810 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1964362jad; Sun, 6 May 2018 07:19:57 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqOU2ldWaIW0OMzLyAhbmRh9k2DKsWtTwo4pGZQoHT3xPcOqokDhrQnC/m42XQ0Izet5o3+ X-Received: by 2002:adf:c54b:: with SMTP id s11-v6mr24729181wrf.46.1525616397578; Sun, 06 May 2018 07:19:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525616397; cv=none; d=google.com; s=arc-20160816; b=A+yyWdTEYT8Q3WQE6o+FUHKpanyHOwXi8E0OhqzHOEoKt36bhr7UMz0LhDDpPRpuAM YHsYeDJsZOlBW5Ss63tSsAbb34yG8PEmMwjpnRNWszBUpDvZlbCiMHx/uwGGAkLjgsUg KYbl2XOymfXTU941YCtlOkp/6YCu1f1f8Cfpk0+7NCr6AMADfgF7q4v7Pmwin+HnSFtr ffU9uuiuVTnyWmAjVYcAln50oKWbmxs+ehCzF/QKH4lf66jTJYIALn7cNo6WguJMQpzz F3Aappy20iH0qIsXGgPXtE49XiiIZirjoDvVL8oC4/doJjKZRJR3buYLKub8sHEWfk+x SH0A== 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: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=gGluI9Bpnr7JvGXCYnEDp+xJmZpwUANnQuK8rqJ4Rjk=; b=B71WOBnMByOsBUYvnwl3t1UIjNAi24KugdZ2z8xriHK/Z8QBmFVxYTGy+PThu+DjFH 4BXdydhoIng3pNHDhttySv1wVQZw9O/ZUxWQccUIi2hAhKNkZMJvB1jDW4y4HmmT8JGN cr1QuaF/C8G6Y7AsxQflSBm9HgUynd1xgYQV/jKVFYpNuzmdEqfwDANANMPwiENRzev1 ojqjJ8tNmr425cIvt20lMG1kEcaQkCpIdPbqijuO2KlDkBnzFubpQ+xKHcxxHTGgQCd5 Noujjwy1xxcs3EsY0MoqsvkwqC4YyPK6HOzrxpHfsAdK+Cj7MRR2yLoOkwHeaWPgC+gA RmHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nk/NG8qJ; 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=QUARANTINE 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 t126-v6si3637623wmg.43.2018.05.06.07.19.56; Sun, 06 May 2018 07:19:57 -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=nk/NG8qJ; 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=QUARANTINE 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 EA4C768A584; Sun, 6 May 2018 17:19:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com [209.85.215.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE78368A1D2 for ; Sun, 6 May 2018 17:19:13 +0300 (EEST) Received: by mail-lf0-f44.google.com with SMTP id m18-v6so37011239lfb.0 for ; Sun, 06 May 2018 07:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Jcg2uNuB8jU+vlRVu/b0OotMy/kN5+0dofb1rapeRq0=; b=nk/NG8qJtGMwcxF7egp8egDomhvK/DrHxb7/eqONWTX/uVnh3krrsZ8gmdwC3ssX10 0aIwPuJWL+fu4am2etxnTG5UyRNNL7pbS9sq3PztIWV5qPDuIl2Yz0ImShKmL6T2yupp u1/u+dUUQeke87uZjgCRY1Mo/Zfsw+hwuLlLJZkTSWr3xEzoWKz5gW3ZF9rOrWYkvRVZ /BGqD1l3tukel5Dvng8Qez6ZfKrb/lLRdzBw9uN5JeFoz08qcdoarZ8ODR5mD6DHca0z 5dZHKj/kJ41v3ZhwO8Smb25rVXCtmayXaHdPnsi/m/o/Jd7Q9cTjli7SFa/rrgUxz02D drnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Jcg2uNuB8jU+vlRVu/b0OotMy/kN5+0dofb1rapeRq0=; b=f9qQIymTZtIRUv12+KONdIWiMzZwDGXffLEVvXfs6DGmZRG2XmmJZX0N3nQST9qk6g DYA932aAHTnP/OrcU67wHpLQ71BlQJXdLL0lp3W5kmFbC+IPq4S+NSxn2QtgauWmEfaO NlAvG6j+aO6S0fVfL+0vgEYqbbWY83AhFlRw3EE37zpSnaE31Rc+bfpcJtv2it7pBgiH UkK6057uyHjc001mIxQIQBqQsLXmESVwWSM6Bp/POJy0SdtawTJQ9qPZqJeRSQsgbGah CJUVjO7DFbnAM2TlCE0I70TUlACCciENYjdkhbNVGckX3xSVn88jkyKlfQSd9ukL2DBq 50Ew== X-Gm-Message-State: ALQs6tC0oYuKWAI7QuSsG6fl2MYIcJk4yrBVmC++4DGgcTYvvp0jCtmF o+6SXpxTsqOY/qiSO01jjauDYbJg X-Received: by 2002:a2e:7a0c:: with SMTP id v12-v6mr22124484ljc.79.1525616386897; Sun, 06 May 2018 07:19:46 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id g74-v6sm792432lfl.22.2018.05.06.07.19.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 06 May 2018 07:19:45 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 May 2018 17:19:44 +0300 Message-Id: <20180506141944.8838-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] lavf/bluray: translate a read of 0 to 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Yet another case of forgotten 0 =! EOF translation. The libbluray documentation specifically mentions that a read of 0 is EOF. Reported by Fyr on IRC. --- libavformat/bluray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/bluray.c b/libavformat/bluray.c index 9282bf9956..635c4f1b87 100644 --- a/libavformat/bluray.c +++ b/libavformat/bluray.c @@ -198,7 +198,7 @@ static int bluray_read(URLContext *h, unsigned char *buf, int size) len = bd_read(bd->bd, buf, size); - return len; + return len == 0 ? AVERROR_EOF : len; } static int64_t bluray_seek(URLContext *h, int64_t pos, int whence)