From patchwork Wed Sep 28 10:07:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Tomas_H=C3=A4rdin?= X-Patchwork-Id: 38426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp99512pzh; Wed, 28 Sep 2022 03:08:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Im2WGLOSqc+xds58LVBHA/v4XceKWHIEzW+L7qk/I13e2eG4ohIsCBPQxtn95foSiOW/1 X-Received: by 2002:a17:907:701:b0:780:2c44:e4dd with SMTP id xb1-20020a170907070100b007802c44e4ddmr27030625ejb.589.1664359687678; Wed, 28 Sep 2022 03:08:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664359687; cv=none; d=google.com; s=arc-20160816; b=FXX4Yg6lrw5Hdar+HnI6PFdLpuf8ixjYXFWseUFXhEP84u8EvCkQLHJjoM3kG90IvG 5kCVw/Oey4yckCKJhRIhXg49rA04hM8AvJTJu0Fm47Wjp83+8WSwgp5Fzk3EVIyi1P4w cHJoAjFxl2Btmy3dbePFL65Z41u+ZXEnUTILaAQhek94unJvcDl1jQqOOLybmJOk6CgK 0lynWnL12RDs5HBFZtmnQa3g+nZvWY3hgorHQYJ15lf5IbRJYBnp2RVPXqutuYnSezj1 b1qFr3gslqW5tjv40BCKwESWpWSAx56nFY12JuDd7i2XYTBkkjwmzPY5Msn7/hXyr+aY 3lJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:user-agent:references:in-reply-to:date:to:from :message-id:delivered-to; bh=+koawNGNJb9b+5YAQQXnjqNXi2aIUe3c/T5TpQnjMB4=; b=JVDalUI0u8tGb1nOJesA5EMdmU1Ax5LqYfEyCuI9inI1ZkisAyLpAAr2e8f5pEGnzY sfqAqOQkcdpsZIEkPAyNbJqMoLnw+aVdKMEyZvfdt3zjLa0P6EC0/Rs02M8go5gRXDpF lDaYZ4K/V2r/lKk7bkWwn6Yegf2FKFSkg/I5T3i8WK8m5yaxyLMEpbXUwJVVVviucwCq Xo93d0AZ35n1ZVMIJxOTQV7Km42V5NbWflJZv9hd15sRCao4haXgZCNG5u5WMN+/QEIq e446cYZlJJ20yhwG5fSlqBTTpuyZPZA5BVCqZrgk/Qt7bwGpL3E0ftdb4LXmHTkOH+RB Prog== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r20-20020a170906281400b0078312c674f1si3647725ejc.227.2022.09.28.03.08.06; Wed, 28 Sep 2022 03:08:07 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 837A268BC4C; Wed, 28 Sep 2022 13:08:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.frobbit.se (mail.frobbit.se [85.30.129.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6E6C68BC44 for ; Wed, 28 Sep 2022 13:07:57 +0300 (EEST) Received: from debian.lan (unknown [IPv6:2a00:66c0:a::72c]) by mail.frobbit.se (Postfix) with ESMTPSA id 30CC4213E0 for ; Wed, 28 Sep 2022 12:07:57 +0200 (CEST) Message-ID: From: Tomas =?iso-8859-1?q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Wed, 28 Sep 2022 12:07:56 +0200 In-Reply-To: <65e79fe701374868bb2f4b70ce8fd220938e2e86.camel@haerdin.se> References: <65e79fe701374868bb2f4b70ce8fd220938e2e86.camel@haerdin.se> User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/11] lavc/jpeg2000: Reindent 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BI0ll87p70KE From 2e915fbbd481c1d202c0ec058842cfc9f9593871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= Date: Tue, 14 Jun 2022 11:23:08 +0200 Subject: [PATCH 08/11] lavc/jpeg2000: Reindent --- libavcodec/jpeg2000.c | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 203782502c..2574c2b97e 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -94,34 +94,34 @@ static int ff_jpeg2000_tag_tree_init(Jpeg2000TgtNode **old, unsigned int *size, } else return AVERROR(ENOMEM); } else { - tt_size = tag_tree_size(w, h); + tt_size = tag_tree_size(w, h); - if (av_size_mult(tt_size, sizeof(*t), &prod)) - return AVERROR(ENOMEM); + if (av_size_mult(tt_size, sizeof(*t), &prod)) + return AVERROR(ENOMEM); - av_fast_malloc(old, size, prod); - if (!*old) - return AVERROR(ENOMEM); - t = *old; - memset(*old, 0, prod); + av_fast_malloc(old, size, prod); + if (!*old) + return AVERROR(ENOMEM); + t = *old; + memset(*old, 0, prod); - while (w > 1 || h > 1) { - int i, j; - pw = w; - ph = h; + while (w > 1 || h > 1) { + int i, j; + pw = w; + ph = h; - w = (w + 1) >> 1; - h = (h + 1) >> 1; - ofs += pw * ph; + w = (w + 1) >> 1; + h = (h + 1) >> 1; + ofs += pw * ph; - for (i = 0; i < ph; i++) - for (j = 0; j < pw; j++) - t[i * pw + j].parent = (i >> 1) * w + (j >> 1) + ofs; + for (i = 0; i < ph; i++) + for (j = 0; j < pw; j++) + t[i * pw + j].parent = (i >> 1) * w + (j >> 1) + ofs; - t += pw * ph; - } - t[0].parent = -1; - return 0; + t += pw * ph; + } + t[0].parent = -1; + return 0; } } -- 2.30.2