From patchwork Sun Jan 27 16:08:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: no pls X-Patchwork-Id: 11921 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 9AF1944CBF3 for ; Thu, 31 Jan 2019 01:15:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF89168ACC2; Thu, 31 Jan 2019 01:14:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8528F68AF32 for ; Sun, 27 Jan 2019 18:08:22 +0200 (EET) Received: by mail-ot1-f41.google.com with SMTP id n8so12683217otl.6 for ; Sun, 27 Jan 2019 08:08:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9KsiAMIltf7B2IvQ0YXUP/CX7HSk8OBcJtZE3uOqz6w=; b=LEPdaO2/S4JUjSyHsEuTc85EVfXTPvNPHoROm56kzIV1GT4VD/sHDzti6owPeWhJ5D r4cN4Hn2xkNS59r0MkurwX5TamhnzW7XPDeE2Ql+vP+fKl2kQkFEsRMdbZntGp/WxM2P 6M3kZtDBwI7n3szCr4m7NRArqla2pZXVq4cEY19mtaJ8XUIcKxwfO/khbLu16C1e3Sa5 SINiAxWtRGSMdg9JWTVxn/1CgIQVqThXBxMe92oiDwfUIUFx7aDoviZtith6WsMy9Rsu 30/Xa0kw5OzQouv72iDZCEh57o64hSCnCt8f8sa1EE0POhwguz+AN/lXQ8oz8NwdF3/S 5W3Q== 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:mime-version :content-transfer-encoding; bh=9KsiAMIltf7B2IvQ0YXUP/CX7HSk8OBcJtZE3uOqz6w=; b=hRHTOTW/rIVE+t4e/oFjkPbHJEZCbQvzGaHpYhJRZmJaAVm7+/dIYdw5CrgjNhbLd1 EFZcDNEUw/dxGuNYrDg1NdMBbtJdoaTQYFApQW/I3wYrr1k8jKCxhf/YWb0ulFoY4dVe wZ+yZI9tj2FjQn+rcmAUSXPhzX5SDLJ/ff/zpZzI65e3nbdYky688z5QmGdXynzDXd2A zglBO1bhtd3CFE9JXJ3LTYeyWEwvMZ4GSabvigK73GSP7WURGzSRgYXGri3QvyKhHESi h62Qb+X5O1tyN4m8R1M3i2EDQC8zXeFZG+Ay6zuaF+H8RAaeE93VIiJCR0UzNq68JlvR Uz0Q== X-Gm-Message-State: AJcUukd3GS/XZ9rIccDndnx2x9H5YsUoD42mGiSbaSoMZP8bKrgxByWR t7q7Dp9lLyo8RWHmxldVP818dRrc X-Google-Smtp-Source: ALg8bN7ezyZRelisPeQj/6Bxjkv+mega0PPjkejhTN9JhYxJDh1jCQH+lfxv1QA8N8sKm4aBbPeOQg== X-Received: by 2002:a9d:3d0:: with SMTP id f74mr13642512otf.52.1548605320673; Sun, 27 Jan 2019 08:08:40 -0800 (PST) Received: from darkness.attlocal.net ([2602:306:8385:d210::647]) by smtp.gmail.com with ESMTPSA id g138sm4029738oib.26.2019.01.27.08.08.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 Jan 2019 08:08:39 -0800 (PST) From: agrecascino123@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Jan 2019 11:08:29 -0500 Message-Id: <20190127160829.21377-1-agrecascino123@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 31 Jan 2019 01:14:58 +0200 Subject: [FFmpeg-devel] [PATCH] avformat/mov: fix sidx size being doubled in offset. 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: mptcultist Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: mptcultist fixes an issue where if the video size was very specific, ffmpeg would hang from not filling the sidx_pts for all streams, due to not reading the last sidx lump. for #7572 --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 9b9739f788..c222582886 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4933,7 +4933,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - int64_t offset = avio_tell(pb) + atom.size, pts, timestamp; + int64_t offset = avio_tell(pb), pts, timestamp; uint8_t version; unsigned i, j, track_id, item_count; AVStream *st = NULL;