From patchwork Tue Sep 1 15:03:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 22049 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 3DC16449D11 for ; Tue, 1 Sep 2020 18:11:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1598E68AD4C; Tue, 1 Sep 2020 18:11:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCDCF6880D5 for ; Tue, 1 Sep 2020 18:10:55 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id a9so1525609wmm.2 for ; Tue, 01 Sep 2020 08:10:55 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jbksy4iz9bPmXR8w0o3ISYR8zxgojvmlpky+rQ+82Pg=; b=oAIFrBQ4x/Krec63THB3EZH5RUP88KHAMdxjdE4PzVt19u331Sw2oTxXwFytgqUqXS Y4O/juNtKlqwJFy+rtwBtplKvcWa3UY6F++3qS1wE6sa6p1KD+Y7is1mXkvBnHZ6wXzn SS0aOWs8TpkAE+p2i+nHWyuLjVFIg1dEdYvIaSzKTFw6dQmwMg7IVHoEotvcCTp/EyQd HBlrGSqdHeKwnAPwsnd14NWI+P5kRzNW7meHuKlkVvEX+gR7aCuOaKSJPZIUW2FK9Jid hB3/2958NIiGf+T0kInxHEuYzdq7maNX9NGb1XyXA/lcpPG7aSvk7pCdNqnQDghuIbMj HR3w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jbksy4iz9bPmXR8w0o3ISYR8zxgojvmlpky+rQ+82Pg=; b=C7uWJ4G3Ny/aZaH45gItbIpD0TKEmVBtCyQ1LPY7oOqO/noevXeA6/DNfvz3V0GRBK vGcDXK19qWNihDN56qE/3WUwwCIczIRwXNRiiC+YHIV8/zZscv/Humvm00T1QzVaNGkR H+QPmt4nVF9UxjKuxeX3S/8E+X2b9MRzMOVawJWK49fcbPerRMGeExwAvoELoChirxEz Pm8pbGEkYQIsAFDQYAuARpGuiRixzl+rfnlAYVtHO08jOOxQC9hJmV9jyINs01B0L2DU 9CtzHvw4S0Lcq0hNw4IqizznnXUgnPZE87Cm9gmv8ZtCzuZI68x3wOtrBSs2Ik2g/BAz KUKA== X-Gm-Message-State: AOAM530lv+A6d/99O0yn2HWbcFE4HuTHMku2BHWcACmgiBKbVtLKEjHp Dcnml8LtdY4z8IXqknmWR4yT65sjVNE= X-Google-Smtp-Source: ABdhPJydDIL+uLRmrH+AgdPdfWEggKQuj8l5PodubJekKcfGh3ZRemw2Lybo6NrGG23e4fBaURKD6w== X-Received: by 2002:a7b:c76e:: with SMTP id x14mr2182154wmk.176.1598972628062; Tue, 01 Sep 2020 08:03:48 -0700 (PDT) Received: from localhost.localdomain ([81.2.169.31]) by smtp.gmail.com with ESMTPSA id l18sm2655252wrm.52.2020.09.01.08.03.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 08:03:47 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Sep 2020 16:03:33 +0100 Message-Id: <20200901150335.103855-2-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200901150335.103855-1-derek.buitenhuis@gmail.com> References: <20200901150335.103855-1-derek.buitenhuis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/mov: Do not try and seek to an mfra if the reader can't seek 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: dalecurtis@chromium.org Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Derek Buitenhuis --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index f0b4edc2ed..49c2d05d21 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5094,7 +5094,7 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom) // See if the remaining bytes are just an mfra which we can ignore. is_complete = offset == stream_size; - if (!is_complete) { + if (!is_complete && (pb->seekable & AVIO_SEEKABLE_NORMAL)) { int64_t ret; int64_t original_pos = avio_tell(pb); int32_t mfra_size;