From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C03AA466C4 for ; Thu, 1 Jun 2023 00:28:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D6D6568C22C; Thu, 1 Jun 2023 03:28:45 +0300 (EEST) Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 320A368C083 for ; Thu, 1 Jun 2023 03:28:40 +0300 (EEST) Received: by mail-ot1-f49.google.com with SMTP id 46e09a7af769-6af549a7fb4so1055059a34.1 for ; Wed, 31 May 2023 17:28:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685579318; x=1688171318; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=4OA0Fv7csekQWBthAni7OH2+tENKEXGnddvlcQZIQ3Y=; b=sf3849eYDH/apxhNcRabU1eoWYVJj2Bv6QSwFqrjbxrH8wykbKv/7zbNaZbbtvuJPW gHZPzWeq8lR0yUQ4eohcl6Nhz75hbhLSGXO7sA4kFk30nh+5gjYbihkIiQZhAUXjP/Q1 fEhl3Wy06enwBi7XdiQJUweiGtEbqUqHc37/CSpbfDUamwJ/lY8f2xuCy6RfnC8D8Z+t +afe6adoNMW2Ye1VhHZcc6o2ba98pEmsQSIB+8M+Z3RBrpMZ78/Z3zGDLeeDSYaTTAy5 5BbAjeDq8fdqW6wTs9qCDreAjXYlVSc+B+AMIk8JxmRZwSiV634gdmashJ4iDkL8zPin D9Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685579318; x=1688171318; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4OA0Fv7csekQWBthAni7OH2+tENKEXGnddvlcQZIQ3Y=; b=JigJtt1W2Z/OmLQwfBr1gczwgPE6VpE7aPXC+Fa9OL9MZcnbx8IXCD3Bv9/RjcIFqc FQP4LTIQTyDfS7LUXWUlOMgsmnTzcJ8rT9G8gQYbwYGMCBcnUhB9YlWni+eiKRYs+Y4l CkLfJT++I1Imb5rX9j7UwT9as6J2bBW8E3IT0lO4VerKWKwD9tP+cceS/nL5S12hwR0r pZMKjyj8uQF0OU8g1cM2QnyBm9iaVLqCM9GvN32EZB/MdKR6kw98NoJW4zetVYLXjXDl UMjHfByI4NjRsbdvU8ZTUx5t08qzZbB4SCc3Wia2U5tllmVXb1AHVzskG1KpbqctcSG6 dBbw== X-Gm-Message-State: AC+VfDxBaouHLANOMqc2A2VWm7vVPjamsRKAD5yWga3w4rFqoUePsXZr 6pIMmt8Cs/a9J8FZkrfn+9NvfrklH38= X-Google-Smtp-Source: ACHHUZ4DSHyvH1OfxZGlUpWB8xb07ndlDYwRrx6WNb9GmNs9jp61fUBPVOt2Njv8UEGKsgLyPI223g== X-Received: by 2002:a05:6870:956d:b0:19f:515d:9276 with SMTP id v45-20020a056870956d00b0019f515d9276mr126523oal.17.1685579318058; Wed, 31 May 2023 17:28:38 -0700 (PDT) Received: from [192.168.0.12] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id f18-20020a056830205200b006a662e9f074sm1013775otp.58.2023.05.31.17.28.36 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 31 May 2023 17:28:37 -0700 (PDT) Message-ID: <52b15fe6-52c9-eb16-7b48-d385c12ae9fd@gmail.com> Date: Wed, 31 May 2023 21:28:35 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.2 To: ffmpeg-devel@ffmpeg.org References: <20230601002659.9506-1-michael@niedermayer.cc> Content-Language: en-US From: James Almer In-Reply-To: <20230601002659.9506-1-michael@niedermayer.cc> Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/lcldec: Make PNG filter addressing match the code afterwards 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 5/31/2023 9:26 PM, Michael Niedermayer wrote: > Also update check accordingly > > Fixes: tickets/10237/mszh_306_306_yuv422_nocompress.avi > Fixes: tickets/10237/mszh_306_306_yuv411_nocompress.avi > > Signed-off-by: Michael Niedermayer > --- > libavcodec/lcldec.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c > index ed78d9d570..1c93378c4c 100644 > --- a/libavcodec/lcldec.c > +++ b/libavcodec/lcldec.c > @@ -231,16 +231,19 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, > break; > case COMP_MSZH_NOCOMP: { > int bppx2; > + int widtha = width; nit: aligned_width is clearer, imo. > switch (c->imgtype) { > case IMGTYPE_YUV111: > case IMGTYPE_RGB24: > bppx2 = 6; > break; > case IMGTYPE_YUV422: > + widtha &= ~3; > case IMGTYPE_YUV211: > bppx2 = 4; > break; > case IMGTYPE_YUV411: > + widtha &= ~3; > case IMGTYPE_YUV420: > bppx2 = 3; > break; > @@ -248,7 +251,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, > bppx2 = 0; // will error out below > break; > } > - if (len < ((width * height * bppx2) >> 1)) > + if (len < ((widtha * height * bppx2) >> 1)) > return AVERROR_INVALIDDATA; > break; > } > @@ -314,8 +317,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, > } > break; > case IMGTYPE_YUV422: > + pixel_ptr = 0; > for (row = 0; row < height; row++) { > - pixel_ptr = row * width * 2; > yq = uq = vq =0; > for (col = 0; col < width/4; col++) { > encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; > @@ -331,8 +334,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, > } > break; > case IMGTYPE_YUV411: > + pixel_ptr = 0; > for (row = 0; row < height; row++) { > - pixel_ptr = row * width / 2 * 3; > yq = uq = vq =0; > for (col = 0; col < width/4; col++) { > encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; _______________________________________________ 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".