From patchwork Fri Dec 8 12:45:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 6609 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp497568jah; Fri, 8 Dec 2017 04:46:05 -0800 (PST) X-Google-Smtp-Source: AGs4zMYBJqa07TUERuis53TaHqH1MR5b1MsRhP4MkB35zDm//bvMXSL7AmEkvvsRfVVxMzoDHAWH X-Received: by 10.223.144.204 with SMTP id i70mr27548694wri.57.1512737165890; Fri, 08 Dec 2017 04:46:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512737165; cv=none; d=google.com; s=arc-20160816; b=l1QS/xRJVaHeiWJcUN1KuLRR6GKIhRBPv8bPkkTs8dmIVq1Pxu5F4057tEL26BvFRz yaCj0xLTk2geuYitYmOgnCj/dFw2JMh6I6Hqb4ves6t/1+aOKN4++L3IuIIWb5KhlMcq FiGpL4C+VnjTPiofFlEsd9p/M3dKnbV+k7be1s33dyVZG+eT1oJWMsnd43naXaYHiw9g +DlsWDdOPvEiN/E9d7zusgi8735rMq55R+SISiUdSs43K/aXeSbsd3ci+OK5dWSGCdkK kqNeBtu3FY0H2ebwNoU0D5G+1MZzk9Fb0wNEtBeuHiXo5WYZfoWWP5XS5TjDXWLNcJrk rwIw== 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=lY8Su6au+zMtxFavGbkcCP8PMPuPmae2L+/roFbZ5BM=; b=pIF1iiXGVXBNZ+zI8I1r8PLawQkwRxFiCjNAUUOF+CjS3uOdZPlUUpgsgPioXWL5Dy K9DLLnds8P2GgRu3M9iCVVjfupq02FC2j6Y1uz9Ojjsjklho4iWyWDJwsUxfNVBBt+08 uHzFuYh0jPpl8ec+q5QCxge6ng/QkmN3RNaRKCmOmdF1yr87slmPKctpvpUdj3VQu5s+ YvbR98+n2XzOF1/SWNgUBbUhYPFNlrDXG2T9Alx90cmoM9tn6/KUuOS9DwGzM8IdPxW7 1erJXpeRRx7OsDL9yUCqbuuTmKxAt4uhxVaiyRY3Ss0jVOpNeMdrXfYAhezRvY0vQsfa EgCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=g3RiixME; 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 b14si1094468wma.161.2017.12.08.04.46.05; Fri, 08 Dec 2017 04:46:05 -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=g3RiixME; 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 3383068A4C2; Fri, 8 Dec 2017 14:45:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFFCE68A1C6 for ; Fri, 8 Dec 2017 14:45:43 +0200 (EET) Received: by mail-it0-f66.google.com with SMTP id f143so4515986itb.0 for ; Fri, 08 Dec 2017 04:45:50 -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=zj310yg/VqIbAHTnhHsU5wWo3tLl1+zCLdlYZFmnLbs=; b=g3RiixMEZJRXFaTTvqpRO2kNQDHs2Dfo5BdG4CYM7z0DUp2fRKYOP4fLmGR1T0Atp7 KwpyTsq1dV7g/3ashTFB66WPVYpoKYv7fYFmyQpxjn+qQ/26J1YXA2rDiTLlHzYJsO7F ZDc11Qx05Ljti2MJ5FqMPlM1/yjMCCW0jZ9AXP0If0NkURBoxwTAKiFfKoBkxSkPc0eo 2Rxju/CAc/iPXX7EI2bZBr+WZqLz9G+T5cgUVQr32AKNxkyLWokauX5lpqOHlD28VtS/ DtTkPXfnWRiZgPeOAxwmjtlgvTN4UiEUf6WDKuVC+kO83oh5ZRk9ogikqAQWHsC3aU3A 5VaA== 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=zj310yg/VqIbAHTnhHsU5wWo3tLl1+zCLdlYZFmnLbs=; b=rw9Zt+A+bK66b+91qwgu8aCdneGZB9J9rwTJNMtyw0hMWfgMparOcXxOL6ahOHA/X3 DkR8EoLaDnBtiOURr7D4syjL8kgV08lu8YDq9T+lue0hkH6GYt+GXWoXKqDjQdWHuNwH h1JrTHTptFPnyTISEFYXZ/tdsyYRfy3i73ddGtgXwu16+zDOMqfhiKgCh9GO6Z6Oc5AU YB9yMDKN9cKEBRTpmukZun91AlzqZlS0nwaI0GmWc1f5A8V6iTzfqtjwLeynJzdEacbp 8iVtfxyzQxfQo2xr2QfWUZIUrcSPy1MSvm8kb/SFNRSPA/BUSuwzTzje2kQDioGsYto2 K/iA== X-Gm-Message-State: AKGB3mLYsH5BQ+t3UNXqw82aOmr+ByOvDrtZFH08+bihn4xdmqfFWRgG s6/gbF/XALMgZWcIPpvsk+vJKmRP X-Received: by 10.36.103.199 with SMTP id u190mr5131855itc.56.1512737148744; Fri, 08 Dec 2017 04:45:48 -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 b77sm3567962ioj.42.2017.12.08.04.45.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Dec 2017 04:45:47 -0800 (PST) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Dec 2017 06:45:35 -0600 Message-Id: <20171208124536.44946-2-rodger.combs@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171208124536.44946-1-rodger.combs@gmail.com> References: <20171208124536.44946-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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 93a3ec4a07..2d23f2ee84 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3531,8 +3531,10 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, int64_t pos = avio_tell(matroska->ctx->pb); matroska_clear_queue(matroska); if (matroska_parse_cluster(matroska) < 0) { - if (matroska_resync(matroska, pos) < 0) + if (matroska_resync(matroska, pos) < 0) { + index = -1; break; + } } } }