From patchwork Mon Jun 5 18:28:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kucera X-Patchwork-Id: 3845 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp1484983vsk; Mon, 5 Jun 2017 11:28:47 -0700 (PDT) X-Received: by 10.28.196.2 with SMTP id u2mr4313425wmf.104.1496687327053; Mon, 05 Jun 2017 11:28:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496687327; cv=none; d=google.com; s=arc-20160816; b=KsiJR5UJWGTVuZWPL0D2MRJGP23bQxVrYY/oOl4Pm9ThdsQ2oKrqId9J2VszSOBVu0 TDrlYQfLpWInITQb20sEQL60seKl4L+HDwSA9YbuOYhJT4+wlyQrTQ2BTGAG5D+QKqH+ We0PPTr7Np2Wx1qNgO/tcOLMIz11AUTXIEKkE1TRTnSBZXbZtVe6YzOUkSdcHXwt11LN ZNhaORlELAdDLh8D5SLUCsSRzWyLiEzQVi1KSuO7ZhEjBNEWkg0Snmq9j/5Shl5oZ9LR ig0zgUcJ77l1WHuww0aXZA01y49szOLWFK/A75/xXu36NIEhs1ELFOmHhbwkPDg8CU8H nhww== 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=FmYm1P1LMw+k5MEcNLQchFrNeo0Ql3PYj6LG5o3ZVqc=; b=hIJb0DN795BaT9bBn2GLrJbz25ONF9xUF3CaOIooB7VRz1T9E6hDFPTXZcut0kMUlM w/3sCSU5vypC/YO2CpPa5YfvHjlj9TYhuwajv6wQdO57NiKkLSwt/bnD5QcKs5flQ7zD NpMtJBGrqKjf4QAv8G1kxC1qjtgTh+IN/Et+RSWuaMo0nghcubFO41I7COqm9cG0KtV+ 4kexgLQ8JZgpqOwrvDx1h/Js52uaa5ZRlg9Tf3mFe+TafmFve1Swdjny0HmH8e+r2ITe rmpyapV6f4bxC2xuRq6udKc/AhPu8PJVJv+taAeWC+16GSvIP48wc0XGHW1bVZrnBSDz 4zCw== 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 j34si36636847wra.63.2017.06.05.11.28.46; Mon, 05 Jun 2017 11:28:47 -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 7E940689C39; Mon, 5 Jun 2017 21:28:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2E34680362 for ; Mon, 5 Jun 2017 21:28:30 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id x3so3978910wme.0 for ; Mon, 05 Jun 2017 11:28:37 -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=hVecnkkT0/h1qBEEBEHph4huYLfLk2oV4oATHNfQKnk=; b=qUtvZhsulG7wbKrIfo6kZZ6L3R+JJO7FyIUmztlJaH9aiwUUx7qNV2fAfhWCdBauyJ 1euKEwziQVxaNPdpb3ZkKQlWbNwNeW1jYg1azf5+X9kpa4LFVny7JWFmNMdSHNnEU59I vA8ETdpyKxPcSTrh40Gmdt8iwtkXxEOdgS+DlTC7hiEKEMWEu9EuxAHxc1DyeIx4YzfR MWvo/ljVVq4DcXq/daMtbrAFkAat4VK5ItXVI9KcQyi7790jUuTtBQs0O09ptsPeJEhN lfQhiJ8qITj7TReD3RdTIHNOa5FDAVqe/Y1gqiPaEuBwh8eCwcmGUQPcI7t0Yw54FjLr Kd/g== 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=hVecnkkT0/h1qBEEBEHph4huYLfLk2oV4oATHNfQKnk=; b=W7VYI0tmmFCJRzV/PTSrnvVefGJDYFQWAaIFiStzkhPny811c7MkyPwe7PRFuKR55x BKSA/WgWvdPxuCoYKENGO93det7uClCoO2HXPQ8OR+2xddtPlrqzzynfg++ZkWoKzaZc oct69VMT/9/y07SwnHPLQQjZRTPXqsSJBGVOOa5mal6FYYVDRpumPFtOTo4ZGhfadKL/ Ndg1gGQtjVXx88h1FH69XhgZVKxyEq+XZLV1km67DtkV/lphbbujbP2aarM1jkcxuI32 I66vx8LG+xUruv7/bsIEJcKo0mdyV8n8TAqXGn746z5p25Hax/gTkSaGqHNIuwtHkOi9 VOqg== X-Gm-Message-State: AODbwcA64CcjCUuJ6P7x+omL44vF2zu096nEeVQqdVzN3jk8uCJGXFgI m+7hqO/i7R6qAgp0 X-Received: by 10.28.230.155 with SMTP id e27mr8661279wmi.57.1496687317372; Mon, 05 Jun 2017 11:28:37 -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 i3sm12239414wmb.13.2017.06.05.11.28.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Jun 2017 11:28:36 -0700 (PDT) From: Daniel Kucera To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jun 2017 20:28:30 +0200 Message-Id: <20170605182830.18538-1-daniel.kucera@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] libavformat/wtvdec: 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/wtvdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 3ac4501306..ee19fd84da 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -65,7 +65,7 @@ static int64_t seek_by_sector(AVIOContext *pb, int64_t sector, int64_t offset) } /** - * @return bytes read, 0 on end of file, or <0 on error + * @return bytes read, AVERROR_EOF on end of file, or <0 on error */ static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size) { @@ -76,7 +76,7 @@ static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size) if (wf->error || pb->error) return -1; if (wf->position >= wf->length || avio_feof(pb)) - return 0; + return AVERROR_EOF; buf_size = FFMIN(buf_size, wf->length - wf->position); while(nread < buf_size) {