From patchwork Sat Dec 9 02:24:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 6620 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp227387jah; Fri, 8 Dec 2017 18:24:52 -0800 (PST) X-Google-Smtp-Source: AGs4zMbLAkErF4WAdLriVDxqWu+s750zTKlXSyrpGrz+yJ9bHdmsvA6o9dJr4wHzWq5ag4tg6WuU X-Received: by 10.28.55.82 with SMTP id e79mr5061564wma.60.1512786292456; Fri, 08 Dec 2017 18:24:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512786292; cv=none; d=google.com; s=arc-20160816; b=TmimqZULdFGvEHR+yIBR9/UsDfETlH4JhP111MH5KGc12UC/iEAjxv6QBxH1vMbHhw ExRqq3xYK+Xrzv9K3BKaCf80AmR9Yz6Om1F5ClDAer07Ajx4NfvsRM1VAbq7dDQQJbz0 mDoZ5D+QjoTKTiikORMJF1Z+oDBstz85s9bX8WFMN0gMpyB4Me5Pf1rU/vMP3kywQQIi lponW94ijCpkRKzBSXBpzpecrnX1DPH29FsMu82GjMvMp4qk+iGMi/TIdOgAAzn3NSzB LmzbpzxlARLCXk6grgfD5oSXOXJFLuf1iXt2phLsy50V/QBpm8fuH4Y2Ni/vru8Uo8uY ddjg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=1d4xLSp/HOQaK2pEcHX26lZvLGbhTiqvrLqTj8ER7A8=; b=i6WaPAYe3bkgwLibhxR3QpDsv/fAKTmshWOdc5rmcyqLc6XCEXqiBG0px95hY5pDSt xrxuKz9nxO9gTF7/KbPeNwYMEITXRxh2lwkY3y9rIVJ5ysn2ZQnfH7DHbzVWNnq+ERUd IQoR/OoGL9ZWPxyJtpP05odiHZp/OT/JAE4/ZAxaZByqbTFDjoYu29OP11XZi4zRm9sm ZfCYSmVJW3qJYEuT5TqVzpoY4tcMleWscIDin/i3HJ6nHXCdH2JU4/epVWSX/hkGc4Te kK+zfD4fABitV+yFjzfVKwnBdfV2leKpuVfUvznH9BmHiz3qOJdPppN5GPpMy4C1u/WI Nrig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pEK5F6vn; 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 p12si6446954wrh.443.2017.12.08.18.24.51; Fri, 08 Dec 2017 18:24:52 -0800 (PST) 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=pEK5F6vn; 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 907A568A3D9; Sat, 9 Dec 2017 04:24:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f43.google.com (mail-it0-f43.google.com [209.85.214.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59A1868A355 for ; Sat, 9 Dec 2017 04:24:37 +0200 (EET) Received: by mail-it0-f43.google.com with SMTP id d137so7803219itc.2 for ; Fri, 08 Dec 2017 18:24:43 -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; bh=U/FQohmZs6XIqN9kVJbPZmExch9GPWJ0Z+EBItCOZDs=; b=pEK5F6vn0LU/jJadUepUcP810Hui0breiA2pw7XJWcLjuEkgP4JOjLAGQW8REr3/nw DYoaAt+B+qxWq6rLP/Xl9L3SKPVV0322JlCXWq042f1gUZym7kYJSY7FNTVXwf9irWG2 Ql32sWRRxtMrCVVn15NtAKvY2m0hkUCTtYF7m6QM8Pg044p1IhOGNbJ096hTqfj+uLtG r0r/nQidv2/W6eo3HMxXJwT1fLHZ5CmoYf6Pmm2Zlcvx+8zob07WFyOkml6kwKja1BXc AIV+S8Zd5eY0kCj1zz1GpcdRjfS9RhmXAvPk7QRJP9i1v3E7S0YfobDi38e5DBKVEgJg OS7g== 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; bh=U/FQohmZs6XIqN9kVJbPZmExch9GPWJ0Z+EBItCOZDs=; b=E1oyk/b1X6u9lAYq5k8afEs4tFNAFlufHlhecHYGhlUKxKVhHA9M7T+e/Z+gAitggH ib6C8IcTWu3d2srr5QfpNnJBqqBmr0KMxkt9jKi0lVvz+jWQqquyI4bbJICLTiQbuIxp XW98x8dOiRXMdJrvdTd4z8Mrnnr5/4HPtAC5j/5rgIr/fHdyNlpRDlVl0DSI3u1tvfEL S7+geYJL09O13wFvCNmePrSIq0h6AX8XJ2zM/4SEA0Y9G1Fdp4zTuinyGhOMn1MzWF9F T4rZp0cnfvQYwdbExa5bfWr+tNKXqgVfPJ1/92eSQnWW9zwNkCM+Xiel+Rf3N8PL+Vx0 AYLQ== X-Gm-Message-State: AKGB3mIhKPbQKw2+eXxc0PmSCRTbAjzA+Um4d3okm2mWbzgiYjYzkK0f VcUHZ0beSN0qxgPS72gjCx6uSwIr X-Received: by 10.36.90.19 with SMTP id v19mr8027033ita.90.1512786282488; Fri, 08 Dec 2017 18:24:42 -0800 (PST) Received: from Rodgers-MacBook-Pro.local.net (c-73-75-100-12.hsd1.il.comcast.net. [73.75.100.12]) by smtp.gmail.com with ESMTPSA id a69sm1444627itc.18.2017.12.08.18.24.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Dec 2017 18:24:41 -0800 (PST) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Dec 2017 20:24:29 -0600 Message-Id: <20171209022430.85954-2-rodger.combs@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171209022430.85954-1-rodger.combs@gmail.com> References: <20171209022430.85954-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] lavf/matroskadec: fallback to generic seeking if resyncing fails while seeking 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" --- libavformat/matroskadec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b51f67af00..944ed795d5 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3532,8 +3532,12 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, int64_t pos = avio_tell(matroska->ctx->pb); matroska_clear_queue(matroska); if ((ret = matroska_parse_cluster(matroska)) < 0) { - if ((ret == AVERROR_EOF) || matroska_resync(matroska, pos) < 0) + if (ret == AVERROR_EOF) { break; + } else if(matroska_resync(matroska, pos) < 0) { + index = -1; + break; + } } } }