From patchwork Fri Mar 19 05:58:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26463 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 39653449D11 for ; Fri, 19 Mar 2021 07:59:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0921F68819D; Fri, 19 Mar 2021 07:59:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A34236880AA for ; Fri, 19 Mar 2021 07:59:12 +0200 (EET) Received: by mail-ej1-f48.google.com with SMTP id a7so7739428ejs.3 for ; Thu, 18 Mar 2021 22:59:12 -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:reply-to:mime-version :content-transfer-encoding; bh=x+4Sxb0kjj+S/0fabK9TM2c1JI7QU3JbIOq0YM95yyE=; b=u6v7Fqt5EK8dFEAaWyQPIYWNwdpg4PHMK1pjAZAEqZigo667gHl1iBinMmjTvy2VJh uRMKxaraunGF+q9hg8e6CLK1YNUblxwxRUWB8Q3gJPybOvVHXGQ9c8RmAC/QxzPauKae 2flVhbv0C0xNdaBxR/4Om8yWdNYhOz5N20LXJQ//ghHzrD2zQfyU7A5oR7uPkyyFePB0 fK7pRn3K+AI54ajPZIY+MPmGJv8LFXgxF2d6jT8fkd9CbRobAnMD7qhCbBHCicxPpUO0 84xAsFc6HPKDHT1sJZZZ5n7G+CPBHROy6tX3T1497nRtP+CmftRawWuqxCc2LxWDGQxV u08g== 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:reply-to :mime-version:content-transfer-encoding; bh=x+4Sxb0kjj+S/0fabK9TM2c1JI7QU3JbIOq0YM95yyE=; b=HUSsTs8C36DjdKwCBvYrUn9pQMOrgDPs9VlpmpuRT5+qOZvgUpV72VgG5q0FEO1UvZ tPDIJJ5XrWuQHl0eyksLFnWIzGLeMUhN1hjqPPny3U78I1eyJU2dmwSwzm5IXskuHyEb P2sX9mXCtfkSc5d4jd9YqkBPNX9Zz2Diukflm2JievzlhuMF1wb5IzXSqxOJldcqWwRV v3AzKKRQuKT0Cn+7UkGq/aZaF9c7hPg1R9UV0GwumEu8GxOC00fBwTObVbmxvqZW8myS UMhCXrCC4TAJDCqbItQS7pJIT+cLgK18AsSIAPr6p1S18YWfNpvl19r3i+WDMKJD+X1j EQOQ== X-Gm-Message-State: AOAM531NkLSRHE5WB2/GeVxKMunxDGcUEaJ1U7x9Y6ueKUPIGoNLoB0T w4nNUOCv9xxrRDcVlgh1/p+Flk9Yfctskw== X-Google-Smtp-Source: ABdhPJyBpu9gIVoPONFXFxLSKpj/Vr2/NBnAK6RtDlvQJXdeyA/pg/b+BR35NlCKgNP5wr8GnaZWFg== X-Received: by 2002:a17:907:761c:: with SMTP id jx28mr2449775ejc.417.1616133552004; Thu, 18 Mar 2021 22:59:12 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id x17sm3109344ejd.68.2021.03.18.22.59.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 22:59:11 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 06:58:47 +0100 Message-Id: <20210319055904.2264501-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/18] libavformat/utils: Fix indentation 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Originally added in 12f996edfab67b65af0ff1ee829f9eeabb025b0f behind #if 0; aebb56e1844d61965c97e95534c3ae0da69df028 then removed the #if and replaced it by using av_dlog. Then commit 1a3eb042c704dea190c644def5b32c9cee8832b8 replaced this with av_log at trace level. Yet the code block always stayed within { } at an increased level of indentation. Signed-off-by: Andreas Rheinhardt --- libavformat/utils.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 295e676c9c..d9a08c9ccd 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2945,23 +2945,19 @@ static void estimate_timings(AVFormatContext *ic, int64_t old_offset) } update_stream_timings(ic); - { - int i; - AVStream av_unused *st; - for (i = 0; i < ic->nb_streams; i++) { - st = ic->streams[i]; - if (st->time_base.den) - av_log(ic, AV_LOG_TRACE, "stream %d: start_time: %s duration: %s\n", i, - av_ts2timestr(st->start_time, &st->time_base), - av_ts2timestr(st->duration, &st->time_base)); - } - av_log(ic, AV_LOG_TRACE, - "format: start_time: %s duration: %s (estimate from %s) bitrate=%"PRId64" kb/s\n", - av_ts2timestr(ic->start_time, &AV_TIME_BASE_Q), - av_ts2timestr(ic->duration, &AV_TIME_BASE_Q), - duration_estimate_name(ic->duration_estimation_method), - (int64_t)ic->bit_rate / 1000); - } + for (unsigned i = 0; i < ic->nb_streams; i++) { + AVStream *st = ic->streams[i]; + if (st->time_base.den) + av_log(ic, AV_LOG_TRACE, "stream %u: start_time: %s duration: %s\n", i, + av_ts2timestr(st->start_time, &st->time_base), + av_ts2timestr(st->duration, &st->time_base)); + } + av_log(ic, AV_LOG_TRACE, + "format: start_time: %s duration: %s (estimate from %s) bitrate=%"PRId64" kb/s\n", + av_ts2timestr(ic->start_time, &AV_TIME_BASE_Q), + av_ts2timestr(ic->duration, &AV_TIME_BASE_Q), + duration_estimate_name(ic->duration_estimation_method), + (int64_t)ic->bit_rate / 1000); } static int has_codec_parameters(AVStream *st, const char **errmsg_ptr)