From patchwork Sat Dec 9 02:24:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 6622 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp231659jah; Fri, 8 Dec 2017 18:31:16 -0800 (PST) X-Google-Smtp-Source: AGs4zMbM88cvOTlkuJKRsucfUs8PyBqO5DrIVqSHVhSsn/NZ9KBVBIRVhSJDYdY+S+9DlRJVD3JF X-Received: by 10.223.175.100 with SMTP id z91mr31874659wrc.138.1512786676286; Fri, 08 Dec 2017 18:31:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512786676; cv=none; d=google.com; s=arc-20160816; b=yu9ivwXMtjhJ1JZpwE3qhkQf1oNe3anKEN6VxOGT8BLgeUoriPwERCQ987Kn/JpZ8j L7fGn7Z4nfB1t8PVRcfj7UsFoyniJTxjAsazlXZegC5zqOZOy+j5NrU4lnoR5zbk01vF QjBvxeaYuili1E/lSuzQaLmWlq1EV9nEk1XEZy90n3MYb2/pbsWW4qda+Vjj56hZ/HR9 gJmfu5BTjGT31vjWqmWkUb7OPD4XnZD6lo9vjlgUUexM5rtW1OVKckzIZif7TlKpU+dx /dDWMz9CiUFPNgcTN3CQVb8096wcByLenaVE/S3ikN3UcvAWbc6YWYx879grJ3iyIelk cd5w== 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=1gvLmL4pJKptGB4p5jK7C/z3y5KB4IoRcFlgbxeYev0=; b=KQ2XlRkFIbxwPQAj3g7aFICo9MVbYT+dYbM6Aes2JlzSufhflhWd27zjZ6c7ag072a 0NlAyybkt3jC11eCNaEtRlR2xMAl5VsOaQ8sMQvXO/T10hrw3Ucdf7TBlMzJeZvcRkLO qkmjD2XgvtkNRDsfLmHYzB4hJ5yQKqgTgnLLYrEsakVExjGZbMoNFbu6Lri7+a27Lzt3 soSOX33p41TFIWEuSyQ1xoeS/E1vig4u4ymEl4z1eQdEzaZJ1t/lH4MhqPDwhZ2PBViY wQ1Fw9FjDfej99DpW6F8avIdGA9MI9Kdiuwq7+JgYD7n02R2fmnULgVLNz1VeLrJ4ObX sgzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pZTMmQi2; 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 a17si4800365wrg.482.2017.12.08.18.31.15; Fri, 08 Dec 2017 18:31:16 -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=pZTMmQi2; 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 2ABCF68A429; Sat, 9 Dec 2017 04:31:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 13DB868A38A for ; Sat, 9 Dec 2017 04:31:02 +0200 (EET) Received: by mail-io0-f193.google.com with SMTP id e204so4290020iof.12 for ; Fri, 08 Dec 2017 18:31:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=xjIjz7Qt2yz9NetjePPAJVOm9HrGSJowHedGCDJmNxA=; b=pZTMmQi2Eb4zuraiNzqCtJg3IcKfh+2K+DReNcQFSJZaC+O+PM0QEk84BeNCrAAq3c qou6RZr1b4LPOczVpbKk2wzfGbULQLSUs0LEQXX91/CandbZZbHy/Jaz7J7DQWducv8a uVR35oHY3ebsjpHKIjUECIP8pnoiDXDPeMBlbnuE/Bb0aAvmhoyXdB/M/5K466WFMUFo EKRpvoTDQV2mlrO98nUUH/4Ef54horldbfZ1h6ezGgwq5sfVhXXANW1y3L2bu8IO/ErW VK/gjWbdJpJSmKdmhVs6QArKSfrxAnLkbGDo3xFGaSU1jPSGFSg2bqLVS+aiuCK5hgBq 91NA== 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=xjIjz7Qt2yz9NetjePPAJVOm9HrGSJowHedGCDJmNxA=; b=YoikmPvChMx5aKWzm5ZM5fBSKdyXyTyt12b2osrwOEci0P/9me4EMGyZvodJhE4OKI FxjPtUMp2NsjcOpzjnN3eMBxK2SgEg806nk35I98LdyD1Qc9xOigNDOZh+pvzJlA1YNF wUgHjaV5aUHR1l7AOy5q+agVNdrovXXA5AlWTjfCmQD0Qt62AN3FzuzlQY3nmJ6mjuzO QX7jMLUZmZnEh5FC+sqNM3PbvaQl74WzFqK6FAOy0wfQsRgBqpHAV5iXnHy3k84R8Gz/ OFGhpesXJGVKrYxuvQvCSJb9xhpJh7smqcUpDqmMQLlQkHNfVUNdWlxJnlDwS+mP0Xc8 p2bA== X-Gm-Message-State: AJaThX6a3T6mubrTPFg8t3fE3uKdcieJGz3ii+jzCkUAi7nmqRv7Wwvg Bc+83rdJ5IUurxnXJ07oxLP6Yabe X-Received: by 10.107.160.145 with SMTP id j139mr43025540ioe.236.1512786281167; Fri, 08 Dec 2017 18:24:41 -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.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Dec 2017 18:24:40 -0800 (PST) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Dec 2017 20:24:28 -0600 Message-Id: <20171209022430.85954-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH 1/3] lavf/matroskadec: resync if cluster parsing 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 496499b553..b51f67af00 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3528,9 +3528,13 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, SEEK_SET); matroska->current_id = 0; while ((index = av_index_search_timestamp(st, timestamp, flags)) < 0 || index == st->nb_index_entries - 1) { + int ret; + int64_t pos = avio_tell(matroska->ctx->pb); matroska_clear_queue(matroska); - if (matroska_parse_cluster(matroska) < 0) - break; + if ((ret = matroska_parse_cluster(matroska)) < 0) { + if ((ret == AVERROR_EOF) || matroska_resync(matroska, pos) < 0) + break; + } } }