From patchwork Wed Nov 28 07:19:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 11199 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5191744E057 for ; Wed, 28 Nov 2018 09:26:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E743A689F1F; Wed, 28 Nov 2018 09:26:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f177.google.com (mail-it1-f177.google.com [209.85.166.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B802C688354 for ; Wed, 28 Nov 2018 09:26:31 +0200 (EET) Received: by mail-it1-f177.google.com with SMTP id h193so2704608ita.5 for ; Tue, 27 Nov 2018 23:26:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XzEk61U31wNXAYNKD3MG0yH1j2f9c+uxRHSrxEFuGm8=; b=IUH+E9Td87yHeHaxAG/r4ew1VPNki1I5L5kYcjGZS2AvbEhUg5DE+yyzLshXlAvbwX n2BG0DLE58IxcyyiTKeqlzbi1EyRZPT3wQn/qUG4fSOMdbEyMcXasFYtcBuBknF0iCx2 BiWWVn7q5r3Ctn4ikrDQ0wVXFK9NyBkjKZVRYly59RZiRfxixrq/CA6/5c5RrIlsdcyC v2vL9c6n8mNypihZt3W+kcufRnKZtv+qxh/DkfPfPBOxf+Um13JUDQa3rM3eVouhJ3hG 3nl/q16DK4bXG+FQcCmLISbbQ1ZUkLoPt1YZVJJegMkbskrBWaKladXVjaDee88ZxWeA EHsQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=XzEk61U31wNXAYNKD3MG0yH1j2f9c+uxRHSrxEFuGm8=; b=MIF9VPbbPdBRxO8OTVXhYVUI5U01DfaG9VqQENKdno4U85yIwt2/tB1XE4/1fobkYR oO6U6/F91LwpCJXRet9WCTqyqftUIUOG6qCw7Z85iEc2ldNjSJom9e0IcrKVgMpnpdql 2oyeSy+04VV1SqyPI3u37lt3KDKdFAfF5rVaaegc2Xc0/Ly1l1N12faD/Gj7tCw0aU0j fskl9UXojXbzI4hMu6e56Sw6gx3PjPswi2vhKqQ+LHtLmflcYi0VuBzw5QC6/lX8luNa fxMul71M0S+zEOFoQScCzGUl6+2+hVH8LrpwRpOK65AlIti+wi8x5RenvmgvBbCw1CBG 7L2A== X-Gm-Message-State: AA+aEWZlO/QxD5tXz7U8coiZaGGy/5hJxUSu3NJpy382wiZM7hpdr1g+ qnwHP2I8QdKopl1+iA0emHHqBHEt X-Google-Smtp-Source: AFSGD/X/sKMIj1jvgYtyvaB59GUPkIiZ0GKHbgA7BL05iKdJw+6oyUflptegsuTOYY3TI+nwed+QjQ== X-Received: by 2002:a02:8a1c:: with SMTP id j28mr31946418jak.49.1543389609095; Tue, 27 Nov 2018 23:20:09 -0800 (PST) Received: from MacBook-Pro.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id z1sm2207764iog.57.2018.11.27.23.20.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Nov 2018 23:20:08 -0800 (PST) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Nov 2018 01:19:58 -0600 Message-Id: <20181128071959.30447-2-rodger.combs@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128071959.30447-1-rodger.combs@gmail.com> References: <20181128071959.30447-1-rodger.combs@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavf/avidec: don't treat I/O errors 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/avidec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 3f074795a7..1d131b299c 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1383,8 +1383,8 @@ static int ni_prepare_read(AVFormatContext *s) if (i >= 0) { int64_t pos = best_st->index_entries[i].pos; pos += best_ast->packet_size - best_ast->remaining; - if (avio_seek(s->pb, pos + 8, SEEK_SET) < 0) - return AVERROR_EOF; + if ((pos = avio_seek(s->pb, pos + 8, SEEK_SET)) < 0) + return pos; av_assert0(best_ast->remaining <= best_ast->packet_size);