From patchwork Thu Feb 24 11:49:03 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: 34517 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1751189nkx; Thu, 24 Feb 2022 03:50:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJyRFQ9jTZGcm2QeHe7YIY5+VTa2eELm2fixNQb4fubb+lilkUVKoCMgwqX7i3I4CIJCusZX X-Received: by 2002:aa7:d453:0:b0:410:d407:da20 with SMTP id q19-20020aa7d453000000b00410d407da20mr1946402edr.351.1645703417284; Thu, 24 Feb 2022 03:50:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645703417; cv=none; d=google.com; s=arc-20160816; b=aURRljvSVQ9OxURo9k3m4FZbyH866n7ivnXLzVSyMdty02071Dp5A096i0i459UNMh zyH2PaM7tnYqtWsTEvU4jMMdrBgwo6RSqEiYonr/kQbH0WylE2vwIxgMcdSxJ6TgjWZg biesEWHaqh8UZHqCFw++g7TLXZiODtVOJZAR8gfiW4dINqZ6OHafjSadFAi0cSJkwplw MWyvqoUFGaD4i5M5UBsCjhBUL0WMUKof7VzVTGzWleab+Y6kmkGqsgxqE4jJajL9Y78W 9pmNDg22nr/sA6EFWOy33a2Hf1nzIbxZQ9fRIhu5tzWArrG1KuXq32N78nILE6jzO2E+ MQ6Q== 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=EkAgDu1zT2utWUx74cCJEDkZuM1T7MjWrPK6B5kUWnM=; b=iPV096L/+COl2cBL5SRaZrBYlNHeRnD4pMurbDjYsED7VSdoWAx0pczMa41xI9lUv7 we5shwGJwOulN9bDV66gRLPzu0qn23AQf6sZdkPVYvfQKaPj2jGwN4IfaclFqygdsTFp B5aDgtLUbS/DmYqfgtGVB66BlpCU4Srg9UA0mtF2twjCRuqglOeN+LKcXEpwcIidWhUB 7kfm/zVZ+dmK5/QUg1u+6LgsblKXkJeRPkLvHIThBtZEERcA4Rce4nE4Q1zc+xRD6XNg 3Pu9Bo80s5zOQRAWLJidJYJtyvhKLw7S+rlC9g2UD/odeM6akc0apVWdsGsOB3f/OmJQ Fxzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=OTlntn3O; 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 x6si1365220eds.594.2022.02.24.03.50.17; Thu, 24 Feb 2022 03:50:17 -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=OTlntn3O; 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 F12C268B34A; Thu, 24 Feb 2022 13:49:26 +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 3000868B339 for ; Thu, 24 Feb 2022 13:49:20 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1645703347; 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=Zd8SD2eHZYbwXGYvwZkVLjEoxzM4zuCDkHZrqWEK7GE=; b=OTlntn3OoFT7UocBwm0WxnAS4RRcA+IyCWuS7Z9Rui0c2pwq8UgISPF8tPUlYt5ZvswdLs N2Iwi8GIOGsi3Z0Umfs03X7bssxeQHSMHIT8b3CHIuOXrljK6jU+mBCJ1Z2nypJZZX3ZGX 4sGO5E1uc/qThmDqP/0h5HsX/2CBkTg= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id b034fe32; Thu, 24 Feb 2022 11:49:07 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Feb 2022 12:49:03 +0100 Message-Id: <20220224114903.251006-6-u@pkh.me> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220224114903.251006-1-u@pkh.me> References: <20220224114903.251006-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: 7wCEksrvk73o --- libavformat/mov.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 573ee8bda3..86b0651697 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8573,12 +8573,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;