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 CF2D04C3AA for ; Fri, 26 Jul 2024 08:51:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0151C68D73B; Fri, 26 Jul 2024 11:51:18 +0300 (EEST) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3B7368D720 for ; Fri, 26 Jul 2024 11:51:12 +0300 (EEST) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2ef2fccca2cso12090441fa.1 for ; Fri, 26 Jul 2024 01:51:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721983871; x=1722588671; 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=06FYSRD/7dzfdecP140mj2iBrBpQc4ibKpCDb8tg7tc=; b=GujKTmH7qFXRWonOze5FLy8B76zNIBU9Hk+sq8tYa38V76xJs5v/XCbK2urIZxR7UJ ORgw4kIWWw7jU5dmQRWrDEW2LjV9IXJE8Hfdx23YwBsYat2Tx1OzaPW+ILFqgG8Yush1 3YTuk1T8PhfXdMMCuHLcttV8nkM7wIZw+proYMg/N9JhO41i+siu/GSE5wHcac2SQpdm A94Bf9N40WcsyXELkXfrA8kNFFP/+zOqYar73el/zwI+dgq5UaJDbzsREDtoFH4Bt5yl TilH7guQtBidMIHkd+8dRI3rhGwA7r6e0Yz/Wh0/rM08gSCqAj4d0aNEdfseQpOpz7s/ NF+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721983871; x=1722588671; 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=06FYSRD/7dzfdecP140mj2iBrBpQc4ibKpCDb8tg7tc=; b=o8z7kA1jmPzuuuWxLR4V1HOt9uAqHBvj+UEp7PWeeEM187wNQlNy9y1UwK5l2mZ7aT ef7uDjX7VgiVhvnXcZSIBwMlBzpgHztF+mhXGHIPJgI9ai44WfB7SQVS7jLALu+MSdo5 Aeo4R2a+21stAPlRTJ6+HCFI0jLh/PpazsFQLazIJo18gCXTRoPntUNCx+jn17b0f1fq ktiRyl/wLe17ERf547TN+sxkRADH4ns3d5rQHcVJTtMIXr0Io/1Z74xxPisMKA+uDLbc 8NHHl1QlgjliKk3Y3HX7pQgEYDHoSMYk68l+EFDIJYVzFzHVgD/4SGpHd736BcXZGf/y a1KA== X-Gm-Message-State: AOJu0Yy3xaR5d5Sq5WROjb77PlxuhzOX0OkvbRg9e7dC4fpEWH7pAIuT K2AzpGLVtOnUdkQ+Im09A9XIXn70cvnZ6ol4Q1DbV3t3h4pB64cY6g0oeQ== X-Google-Smtp-Source: AGHT+IEkbNNIcGgfo4PkXToYGZ3eyrRFt5zQFmT3jbKCkVVvCx7jCqbsl1nwUZDyUeO603g4DhR/YQ== X-Received: by 2002:a2e:b013:0:b0:2ef:2cdb:5053 with SMTP id 38308e7fff4ca-2f039dbadf3mr34822251fa.37.1721983871181; Fri, 26 Jul 2024 01:51:11 -0700 (PDT) Received: from localhost.localdomain ([152.110.13.78]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac63b59aa5sm1665543a12.43.2024.07.26.01.51.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 26 Jul 2024 01:51:10 -0700 (PDT) From: tonetechnician@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Jul 2024 10:50:44 +0200 Message-Id: <20240726085044.50356-2-tonetechnician@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240726085044.50356-1-tonetechnician@gmail.com> References: <20240726085044.50356-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".