From patchwork Tue Jun 14 14:43:59 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: 36229 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1115351pzb; Tue, 14 Jun 2022 07:44:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyF+Tk0t5OM1dI6k2vUUbALLaNljfC/xJJNEOnblO6Ltd3UZuXbSoqAQndSNeDIrqjt/Ksl X-Received: by 2002:a17:906:7949:b0:711:f02e:c078 with SMTP id l9-20020a170906794900b00711f02ec078mr4713766ejo.628.1655217845985; Tue, 14 Jun 2022 07:44:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655217845; cv=none; d=google.com; s=arc-20160816; b=lcWwB6qNQqlcfh4rrpd9G4pflXXwyPU/bR3CZBSyH6kZn67lHJinEqv2qvMXpS0DKb BaiP/+yj1CK8ZcyszQJEeaPcY+dRZvc1KIApjMrBF7LavEmammOois3cdMCeML1X4DFI BBztwgIBr+wwQ3QKL+AdqpfMleIIi/urhdvGknbmO4/UWfDUjeu8g54MLyalNByzN6nZ snq+5t9yWRmbEmalKWHck3h7pmqAVVqrKzz8o1iYZdfe7qvbIhDquJge+rlpShx449Ji HuQBBxG1vYtjRenAqt+84bcLFFSiBi1TA0eIstjvTzAkR6vKb6imht/AhXr26Hjri56D /yQQ== 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:dkim-signature:dkim-signature:delivered-to; bh=HXPpqRvkSlVcbiba2WD3UHcNeBS6du0J5WhgModP4cI=; b=OynZu5c//3KiFO3M9mWR+J5rECVkhMcW20ZEv0JbAtmyw2CYQ11tSdxEn5Rha/BFEz 1dRgECSiATsMEpYOdOIWEi3nSsi3ilObkpVzNqyg7KtsRRaUFklyLxaFhoTPO2eC9X4u 3pRlPfrzj46qVPSEhB2B2o1ZRKB876EcJTjxzFVqRazsLsaNm1Fn5XfTfpS0EA4jvWTp PQrxqxreueGTV9DFX3ywsfsUb1h1+MDuxdP9RktaxAWr5/W538mIDG7afhKMlK6Rd33W +9UhZz168zT/UEm9DMLcShidu6hz5wsxxRoCpn7aqU42KPlCuyd2GUAO9MwLUcTQ1GR7 PQlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@acc.umu.se header.s=mail1 header.b=tmXwvBCC; dkim=neutral (body hash did not verify) header.i=@acc.umu.se header.s=mail1 header.b=tmXwvBCC; 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=acc.umu.se Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e14-20020a170906648e00b00712002307afsi12342157ejm.88.2022.06.14.07.44.05; Tue, 14 Jun 2022 07:44:05 -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; dkim=neutral (body hash did not verify) header.i=@acc.umu.se header.s=mail1 header.b=tmXwvBCC; dkim=neutral (body hash did not verify) header.i=@acc.umu.se header.s=mail1 header.b=tmXwvBCC; 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=acc.umu.se Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 94F2268B6AB; Tue, 14 Jun 2022 17:44:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.acc.umu.se (mail.acc.umu.se [130.239.18.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3BD37680CAB for ; Tue, 14 Jun 2022 17:44:01 +0300 (EEST) Received: from localhost (localhost.localdomain [127.0.0.1]) by amavisd-new (Postfix) with ESMTP id B515D44DCB for ; Tue, 14 Jun 2022 16:44:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1655217840; bh=8/XHdBCoB5dOTeqZCAlbtZAFTyTZdwnKZG9jV0sZz1o=; h=Subject:From:To:Date:In-Reply-To:References:From; b=tmXwvBCCnG0+UISrUir/YWEN+LVJW34NgMVDOblNNnS7GfajqJug+qYx7VlZQ4Duf cvoB+EotekDOwcncTx0eBugkmPQu3NxRiPBU5HLVSYFRg/5v956idq5SwDPQNFNMSh O8SBWQ1RNqKez56AU2LITQDEX8/4A7htosgjUp0qm433t+LC2+lMvPd5ZMVrO9rAGH e0RhYGAtjvdEayBW5pFehYHwh2NUxMmJzmlYMUAHNJcuDa8CMCapYKUHY1WGPySQ8m M6urCvaD6dNe29Fh1+FqS7LP3c+oMU7OgxAk6o8XVjZ82abs4dcFfbRdGsmOxxaHSe A9WldWxEw7y0w== Received: from debian.lan (unknown [IPv6:2a00:66c0:a::72c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tjoppen) by mail.acc.umu.se (Postfix) with ESMTPSA id 2B44944DC6 for ; Tue, 14 Jun 2022 16:44:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1655217840; bh=8/XHdBCoB5dOTeqZCAlbtZAFTyTZdwnKZG9jV0sZz1o=; h=Subject:From:To:Date:In-Reply-To:References:From; b=tmXwvBCCnG0+UISrUir/YWEN+LVJW34NgMVDOblNNnS7GfajqJug+qYx7VlZQ4Duf cvoB+EotekDOwcncTx0eBugkmPQu3NxRiPBU5HLVSYFRg/5v956idq5SwDPQNFNMSh O8SBWQ1RNqKez56AU2LITQDEX8/4A7htosgjUp0qm433t+LC2+lMvPd5ZMVrO9rAGH e0RhYGAtjvdEayBW5pFehYHwh2NUxMmJzmlYMUAHNJcuDa8CMCapYKUHY1WGPySQ8m M6urCvaD6dNe29Fh1+FqS7LP3c+oMU7OgxAk6o8XVjZ82abs4dcFfbRdGsmOxxaHSe A9WldWxEw7y0w== Message-ID: <716c3b1e162a5da4cfa5eed1de6b6d2954fe560a.camel@acc.umu.se> From: Tomas =?iso-8859-1?q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Tue, 14 Jun 2022 16:43:59 +0200 In-Reply-To: <10ec51ef44325c2de6d5de7b994a9b6c8eb5e3a2.camel@acc.umu.se> References: <10ec51ef44325c2de6d5de7b994a9b6c8eb5e3a2.camel@acc.umu.se> User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/13] 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: lT3UOy//H0fF From d3aaf24ca4778e6ba280f99f9ce90cb15738699b 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 10/13] 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 b80e68bcba..8ee50b77c5 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -93,34 +93,34 @@ static int ff_jpeg2000_tag_tree_init(Jpeg2000TgtNode **old, unsigned int *size, } return 0; } 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