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 CB5DF47A2F for ; Fri, 26 Jul 2024 15:08:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E38C68D7A0; Fri, 26 Jul 2024 18:07:56 +0300 (EEST) Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52E3F68D720 for ; Fri, 26 Jul 2024 18:07:50 +0300 (EEST) Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-2f035ae0fd1so15212261fa.2 for ; Fri, 26 Jul 2024 08:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722006469; x=1722611269; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e8Bdfy2YM8x244rNHzGJq7/4FKoHh1HBYWk4gZZP5cc=; b=OBwsp5/xLOf4FxwHq6zkw8Lb5wULO0BiBfaM6NbszVFk7LhAPPnDtbNgigu6WDRFr7 Cv3JE1cDBkg+Y8gWUo+NVEUDCe1WPTZ7AyVAdUSTMqfS2ykIyP77dSoI5Z7Vex7iDZB3 cfwBKoqZ7Pm63DOgc+HXPFXV2tLjOHf4BOYDCWmq4qt3yr6gqAzpTXOSWAOYgkaFMvoF 1ADv5nYLdSouw4NKfAVEYBzer1hXfA+J77/kAFsHmH+4BnEEKnPfu4UGrncMknfpX/8J he7W+aLhqPVXhsnAoGm1YJelS6yXDZBHTSvafnuFu0dsypACFvWqrnStJe7YDsr6MGjK 2vHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722006469; x=1722611269; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e8Bdfy2YM8x244rNHzGJq7/4FKoHh1HBYWk4gZZP5cc=; b=QN6odhGXYqx9pHkE1U8oYCWuXSkD68tOS5ZE3uNjCQ/RPHTLFx6a0Jql8gMRnkU66L cSPG0224iocxE87d0CvnCqPZmjNCR4feMlKPROh5VOTVVDICLaoLm6Rq6XUDfk4BPtvu lRrRet2aru5swfNl65cLHhtL07/2nSx1tzuZJulfr5h+wwkbgA+3635ZJ1lmW8pZD2ad LfFYDRBrZgfdwsPAvY4gl+9W6A8B2jKt0BqGYMvENKjbo3bGjMZp20KknZpTYhLHIGdl sCDad8+6cGQIBQZASAd1+uGFaVSq/7nUK1yXvgXkOBUv3lZdqUk5HoQS+v1M4n/4v4P9 l43w== X-Gm-Message-State: AOJu0YygeEbFmhIFzpI/oX7WHAgv/GKmJKIHYvVHyMAKZBK/VCjAQ/D9 6VCEjpjTD4e6BJzQjlRqLbjBOYPchHKLdkvKHUFbAil3LOo0n8RClAJ5Hw== X-Google-Smtp-Source: AGHT+IHZ8RMbFpgGoNpFyNBP4j5r5OkTObtuuIZaINKFVfdd1cV0wDnt/KsqUBXdH/tb3Xw4h27RQw== X-Received: by 2002:a2e:7d0d:0:b0:2f0:29e4:dc52 with SMTP id 38308e7fff4ca-2f039d07dc2mr44348151fa.27.1722006468747; Fri, 26 Jul 2024 08:07:48 -0700 (PDT) Received: from localhost.localdomain ([152.110.13.78]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36b367d9bd7sm5337442f8f.34.2024.07.26.08.07.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 26 Jul 2024 08:07:48 -0700 (PDT) From: tonetechnician@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Jul 2024 17:07:38 +0200 Message-Id: <20240726150738.13838-2-tonetechnician@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240726150738.13838-1-tonetechnician@gmail.com> References: <20240726150738.13838-1-tonetechnician@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/1] lavc/exr: decode_block() fails when input resolution not exactly divisable by 8 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 Cc: Sean Devonport Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Sean Devonport This stops decode_block() from failing when the .exr resolution is not divisable by 8 (e.g 108x192). The dc_w and dc_h needs to be round up and not down. --- libavcodec/exr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 4bac0be89b..5df2c55609 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -987,8 +987,8 @@ static int dwa_uncompress(const EXRContext *s, const uint8_t *src, int compresse int64_t version, lo_usize, lo_size; int64_t ac_size, dc_size, rle_usize, rle_csize, rle_raw_size; int64_t ac_count, dc_count, ac_compression; - const int dc_w = td->xsize >> 3; - const int dc_h = td->ysize >> 3; + const int dc_w = (td->xsize + 7) >> 3; + const int dc_h = (td->ysize + 7) >> 3; GetByteContext gb, agb; int skip, ret; -- 2.39.3 (Apple Git-146) _______________________________________________ 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".