From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id 4F35E496FA
	for <ffmpegdev@gitmailbox.com>; Sun, 18 Feb 2024 06:46:40 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 534D668D2ED;
	Sun, 18 Feb 2024 08:46:38 +0200 (EET)
Received: from mx.sdf.org (mx.sdf.org [205.166.94.24])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EA1268D0B5
 for <ffmpeg-devel@ffmpeg.org>; Sun, 18 Feb 2024 08:46:31 +0200 (EET)
Received: from 869728a0df17329e597ee5994a1a1c9d ([1.145.134.137])
 (authenticated (0 bits))
 by mx.sdf.org (8.16.1/8.14.3) with ESMTPSA id 41I6kOTm017743
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO);
 Sun, 18 Feb 2024 06:46:27 GMT
Date: Sun, 18 Feb 2024 17:46:17 +1100
From: Peter Ross <pross@xvid.org>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Message-ID: <ZdGnuQszPLXrClB7@869728a0df17329e597ee5994a1a1c9d>
Mail-Followup-To: FFmpeg development discussions and patches
 <ffmpeg-devel@ffmpeg.org>, 
 Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
References: <GV1SPRMB0063292B34D189C397C657DD8F532@GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <GV1SPRMB0063292B34D189C397C657DD8F532@GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM>
Subject: Re: [FFmpeg-devel] [PATCH] avutil/tx: Use proper default scale for
 double MDCT/RDFT
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/ZdGnuQszPLXrClB7@869728a0df17329e597ee5994a1a1c9d/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

On Sat, Feb 17, 2024 at 08:44:47PM +0100, Andreas Rheinhardt wrote:
> Fixes a bug and a Clang warning:
> "use of logical '||' with constant operand [-Wconstant-logical-operand]"
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavutil/tx.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavutil/tx.c b/libavutil/tx.c
> index cc360cff31..f7aa409d72 100644
> --- a/libavutil/tx.c
> +++ b/libavutil/tx.c
> @@ -914,7 +914,8 @@ av_cold int av_tx_init(AVTXContext **ctx, av_tx_fn *tx, enum AVTXType type,
>      if (!(flags & AV_TX_INPLACE))
>          flags |= FF_TX_OUT_OF_PLACE;
>  
> -    if (!scale && ((type == AV_TX_FLOAT_MDCT) || (type == AV_TX_INT32_MDCT) || (type == AV_TX_FLOAT_RDFT) || (AV_TX_INT32_RDFT)))
> +    if (!scale && ((type == AV_TX_FLOAT_MDCT) || (type == AV_TX_INT32_MDCT) ||
> +                   (type == AV_TX_FLOAT_RDFT) || (type == AV_TX_INT32_RDFT)))
>          scale = &default_scale_f;
>      else if (!scale && ((type == AV_TX_DOUBLE_MDCT) || (type == AV_TX_DOUBLE_RDFT)))
>          scale = &default_scale_d;

pls apply

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".