From patchwork Fri Feb 18 23:20:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 34400 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1378443nkx; Fri, 18 Feb 2022 15:21:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYDxb9g0umpTqIa96dcDdLIG2tnRqAO9D0zelo4uYQo7Cr2hmyJIOz+3CbeVEbWIZ4Mv7w X-Received: by 2002:a50:e004:0:b0:410:a39b:e30c with SMTP id e4-20020a50e004000000b00410a39be30cmr10333809edl.198.1645226467417; Fri, 18 Feb 2022 15:21:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645226467; cv=none; d=google.com; s=arc-20160816; b=xtHXU0F0ZdCQVNQSTG4TwOPYAsHEZWU0XApnFar8eveHjqb/zG7VL+S3zc+C8uIviP UHxfHlPpvqf9MMqDo2iEHhrMEANlrFBnCRrI13nolz8gKZOPPBKMcNzoh7cAi9nNCvOl S43ZetPJ0K1kiOgeke7UAdB7s9BCh2NKiTUOv00kh3J1HUblB+vuGnnk5GxVC2vuiLVi 5rsV0TEvGPDvltOFILLJgTKV9hxaE1BX5Sh1zIV6vS/1k98ESWevzoCu5ApJGTyauI3x cdAN6c+2mxAhC90p5zHixcjDLfXgT0NXhhTrjPwsciGf4FgE/i9ZMQr5JnuwRw6RgRtX wRSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=RN9Mpv6SlMVubBUtpL0XNv6Y3++/dqS4r/C2XtEsRMQ=; b=uwByDO3/dyQJ4DGDFcBze/+dc7mblovry2XuiKMx2stOZIFzxTEiFAKn1I87vO4Xja tZTsYVV7lzSBJy8A6FCwKCF5s9KyabxlfaxKhAVofC7z/IDy6+DBrrsqn2U9/omLILtf 6yVzr28KqWJMUyVpzujo9fsKaQdculu6m+dcahqiSzdzkGzXNtO297Q/lPSpDvn8fvY0 5Yj1tBA+fwnUiMxuaA0rPBv9KhTyB6f3PlbGOryBj4gfHMj0nYriCh4KpHUgmolmyCAh Bycrhumlm6euuDIG3H/xILFlgK3Rdg4K0lN0K9TEXSf3ONWMOxiP6RjAU6htGsUtTRHs 1GdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=TGjvxcS6; 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=pkh.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wn10si1184687ejb.0.2022.02.18.15.21.05; Fri, 18 Feb 2022 15:21:07 -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=@pkh.me header.s=selector1 header.b=TGjvxcS6; 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=pkh.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D6F068B14C; Sat, 19 Feb 2022 01:20:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ssq0.pkh.me (laubervilliers-656-1-228-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 430CE68B124 for ; Sat, 19 Feb 2022 01:20:15 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1645226404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mNwdWUInrOFD9PVHZcTlAgUvolUM0bS7OWEtd6ew0+4=; b=TGjvxcS6hlcQbKjJxx77BEnHZ6SS6BGALsR7vbkmeNCtFeG81eI4Efe+z/+rN1ejklmzNB zCguGkqHK4e1I+lVLu5xNRwH1H4oV/kynmh3ZDuRmOp47RpTaKItwXYXOoVJWVfxkZvmT7 UnkeHkEd3No+Hn/buVYmAcg21qJ0EGc= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 2801152d; Fri, 18 Feb 2022 23:20:04 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 00:20:01 +0100 Message-Id: <20220218232001.345826-6-u@pkh.me> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220218232001.345826-1-u@pkh.me> References: <20220218232001.345826-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/mov: reindent after previous commit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: g3stJCkJNmwp --- libavformat/mov.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 919dd940c0..09cc4e8ad7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8570,12 +8570,12 @@ static int mov_seek_stream(AVFormatContext *s, AVStream *st, int64_t timestamp, return ret; for (;;) { - sample = av_index_search_timestamp(st, timestamp, flags); - av_log(s, AV_LOG_TRACE, "stream %d, timestamp %"PRId64", sample %d\n", st->index, timestamp, sample); - if (sample < 0 && sti->nb_index_entries && timestamp < sti->index_entries[0].timestamp) - sample = 0; - if (sample < 0) /* not sure what to do */ - return AVERROR_INVALIDDATA; + sample = av_index_search_timestamp(st, timestamp, flags); + av_log(s, AV_LOG_TRACE, "stream %d, timestamp %"PRId64", sample %d\n", st->index, timestamp, sample); + if (sample < 0 && sti->nb_index_entries && timestamp < sti->index_entries[0].timestamp) + sample = 0; + if (sample < 0) /* not sure what to do */ + return AVERROR_INVALIDDATA; if (!sample || can_seek_to_key_sample(st, sample, timestamp)) break;