From patchwork Sun Jan 27 15:51:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: no pls X-Patchwork-Id: 11920 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 E4A6644CBF3 for ; Thu, 31 Jan 2019 01:15:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 109A968AC4D; Thu, 31 Jan 2019 01:14:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C546868ACDA for ; Sun, 27 Jan 2019 17:58:16 +0200 (EET) Received: by mail-ot1-f46.google.com with SMTP id k98so12682009otk.3 for ; Sun, 27 Jan 2019 07:58:36 -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=JWoSApyDq0tVep3Z3Tl54kCA+jWOEL2v57BdGeeKvpY=; b=g6EhtGCIqamYAFruTiTW0TCbTTAAlaegyiDiUvI8Im48t2MDxgOs3Lee4EljT7K2vQ PTNKSie8tjCW1XxbG+8MzVWj0ja4QHM44C1XETCnCLV6rh7jkM+wvpE00COsj1noKgCw xz5d0HCNl9ffD0EMRrkkH24vS1Iut52H22PnCn73WCJfx9KsUubDUCAKj/j75D+exx3n 24mRtJzUyB3qkIPF5oA21nF3jHbv+onrAlLVficSKei3mkU2VE4CewLNdma05BJv8MPC zWxBs6UvO/gJICbCklKR00mMet62yEIM2YtrIPecQSxS0P9AND30NICLj8jOyp/KjEUa WCEA== 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=JWoSApyDq0tVep3Z3Tl54kCA+jWOEL2v57BdGeeKvpY=; b=dx8mhTFJf5WyelKvmT2UiF4kD95RdA9zA/uSueU/39o6usrDHjm/bYka9HiWQPOa5X n5vvInTMadnnmpQTIrtEjwC/qTWZyYKpskjOpEXLhMsOdymeNYFdJmn5Ofmt1x/GJQa1 nNkGJr46f2ZEOwowyQSUOpYIOSiWTngoMxUm+X5G8Y7lMOdqXMEBjbX5uXtivDftCpJf Ay9w6k5vOy5wzLWLmh1EXcwaDTTpYHnJ7TfBkkWo3pLWqwNEZBGT7sRIng4L4aV7PF5M ItWlToJgzMf3VPsAhgHgEJLZqJAN7Z6JQ2pTUnVjPWu3NU6lbm6p92sSIqaWUETlIWNm rhKg== X-Gm-Message-State: AJcUukekzYL0nhA1i/JTGSNbTZnExL6E6QefaYbsTj3LZMfjotuO4Y3j tOZcjEQmTOQdoOIlA5E0TGzNbck5 X-Google-Smtp-Source: ALg8bN58CAXhX2ohZysH0VfekjTwKivbXhg7S82lrjwAgb+erQr6VBWAE05twgheqS8KzyeKTNjSDg== X-Received: by 2002:a9d:19a8:: with SMTP id k37mr14688133otk.283.1548604300277; Sun, 27 Jan 2019 07:51:40 -0800 (PST) Received: from darkness.attlocal.net ([2602:306:8385:d210::647]) by smtp.gmail.com with ESMTPSA id f76sm3896982oih.58.2019.01.27.07.51.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 Jan 2019 07:51:39 -0800 (PST) From: agrecascino123@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Jan 2019 10:51:12 -0500 Message-Id: <20190127155112.20529-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:54 +0200 Subject: [FFmpeg-devel] [PATCH] fix sidx size being doubled in offset. 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 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 --- 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;