From patchwork Wed Jun 26 08:20:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 50150 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ccd2:0:b0:482:c625:d099 with SMTP id q18csp272607vqv; Wed, 26 Jun 2024 01:20:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWDxqTl1DvW0b4RNsszJil6DevkaJGpJO0MIXo9wlscA6Nc2TBvBtyVZY9P2EJ4U9Su9TVBH0/lznpoxdltkiVlyyONkzK0dZblaA== X-Google-Smtp-Source: AGHT+IGhviPSvLYgzi1FBLbWg8lHJvjMyuQ/vSFU/meb0FrD2y66OvY0IXaMncMVib7mQht+cWnc X-Received: by 2002:a17:907:cbc6:b0:a72:840d:9ef3 with SMTP id a640c23a62f3a-a72840de9d6mr155776366b.48.1719390058113; Wed, 26 Jun 2024 01:20:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719390058; cv=none; d=google.com; s=arc-20160816; b=G2/whzgJ+47q8uZO1yOl2mOBkCO1rFxChR81WfQz3q8ko+WzH3oB3u9+RPvDoIu7g3 p4Dm/mgSH6JuUPC+T932KKhSyJejfsX4krbB6D4mjDVpHi6YULS65McVOphzxHjJPXck rnZoKDj8EtbRN4dEAK9HAXQ90BpeKAvqTcgqSkTkHT0Zxzh3gkgw9QdHruxTea9ve4DZ VFVWQldzGQ8mwvkOMKl7PQreiJUUuTf+GS20x/7+utlvlSG7LB1PtntrtKR8y09W2u6P vZ576NeSqS/aYEA8FScEFyiImoMTHOcNLGrg9vREJOeJW3bDYzki7TNRWHotrwd9zF5/ ecyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=J0ApeyXxTZGGnJ7whS/ce4dZCTq/vofeYBX5eSBOCdk=; fh=BmCo7omBTbT1U9uZaYNAyg1wX3srS6ESZnqeSyZxyKM=; b=j3MQpGO3MKlpDG52QLNjO9XG9eH+a5+nz5Bbv18FzoCp/TkYN23x3okiumYsZ7+C5A 7yl5wDpdhnL9t8rmvUdXhpC9GBL79zaovYvyYvohIp9e1fag4GIa+BXcJ696zVDRUWR4 vkvDzNdYXBukkYeGphXWIjy3FiOx9o2c8CZ2OiI/sS3LIrogmL5gguaGWEHfP07t2xZc GwyyxMwZG8FY/XRHcMX7ArJJOHktJNBTk5LvTlBtL07ysOn3Ik4x7Qhb9mUZKCq4h6Bu 9Luwu158yQFg6s725ofHkUWNJ7TBI7ZHZHbHjuvoSL4CBsfKbjweAHdLvE9pJA9yFd4b jB8A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=Kb0MGBzL; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a724cc73686si345827666b.469.2024.06.26.01.20.56; Wed, 26 Jun 2024 01:20:58 -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=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=Kb0MGBzL; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16E1F68D478; Wed, 26 Jun 2024 11:20:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58A0668D16C for ; Wed, 26 Jun 2024 11:20:45 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5295e488248so7391358e87.2 for ; Wed, 26 Jun 2024 01:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1719390044; x=1719994844; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=v0R0WjqYS/R7AHv0RDZoTLpYu8Si8XQj+vKhqEXiu4A=; b=Kb0MGBzLpItGYTYo5IZmYONCYDOYbnQLHAIpe8+AL5uPqwU3RYcOJeY5B6566RXanG ZMLCgdUotMhQjb+aqjLrul5aznBO3l/72Oj7no57U/iQ5c71EtroJ42IhTg65PtRUFFX u0mRRtN/35Xt+BPsOVF8h4EtyDcSKAtXxNqkZ9ioswl7dAnouxht9RZhVnjDaRWERqKM 3Mtxlt2Ce7SaTu3nY6I7VVsglF6U2jbadgCCB2k0xKBxBB1uUrTdZUtSLy1d47rx0WoI CCfLnJ+JyMYxK1SsdX7HRWXX0PVSekwvtvvj7VbktALJ+o0Nyh7lbJcHAhNJIiwc1YIq 8PxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719390044; x=1719994844; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=v0R0WjqYS/R7AHv0RDZoTLpYu8Si8XQj+vKhqEXiu4A=; b=MHDYjYo93Yr4fHo+pUB1e7xbuROf0rhfc7gbH6khy1ve9+v04zpHGYSnImRwtmPbVV DLrFN7iQNhk0Du9p/VBfkofVw/rqk966VZQve4xwREA2KWpAW5XFJ/MBjnYmAuDWtOZm BvVz8p/G5eJ150Q6DDz9GZ38bhB7F1Lhx0oBafJQG2JbeeeENP1vkE7DCeCwwwXR+m/Y qxwb4vBbLRFXCY1j0ge0uMuHpEb3WO3MD2nLe++cpak/rWSNklbBCbU/gpNZi2lbTdlG Gclx0ZmYv4hx6qLyKozBzCCrUPEDYyJo6OU9eAS0EBa2MrMi2uSt386kcDAnqlhCZQxN uxMg== X-Gm-Message-State: AOJu0YyrK7NVGT1VatJ5LuRef/yYTQBlvMQkudhR5mv1tI6KUcGMJRap QZ5AhgVAgyntyjjQTLgE5isIsGQEMuom3PBcPb0OLj22v+TWBTYL97evfgDrz6A61IkyQbsuzAa 1KQ== X-Received: by 2002:a05:6512:3484:b0:52c:d7cd:1fa2 with SMTP id 2adb3069b0e04-52ce1835b32mr5105663e87.26.1719390041883; Wed, 26 Jun 2024 01:20:41 -0700 (PDT) Received: from localhost (host-114-191.parnet.fi. [77.234.114.191]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52ce111cd90sm1005055e87.240.2024.06.26.01.20.41 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 26 Jun 2024 01:20:41 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jun 2024 11:20:40 +0300 Message-Id: <20240626082040.40005-1-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/vvcdec: Fix compiling with MSVC 2022 17.8 and older 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: Frank Plowman , Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: i1/AYVgw7I7m Versions of MSVC older than 17.9 error out here with the following error: src/libavcodec/vvc/filter.c(815): error C2059: syntax error: '}' src/libavcodec/vvc/filter.c(832): error C2065: 'all_zero_bs': undeclared identifier src/libavcodec/vvc/filter.c(836): error C2065: 'all_zero_bs': undeclared identifier --- libavcodec/vvc/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vvc/filter.c b/libavcodec/vvc/filter.c index 2cadaaaf22..7ffcb29f47 100644 --- a/libavcodec/vvc/filter.c +++ b/libavcodec/vvc/filter.c @@ -812,7 +812,7 @@ static void vvc_deblock(const VVCLocalContext *lc, int x0, int y0, const int rs, for (int y = y0; y < y_end; y += (DEBLOCK_STEP << vs)) { for (int x = x0 ? x0 : grid; x < x_end; x += grid) { const uint8_t horizontal_ctu_edge = !vertical && !(x % ctb_size); - int32_t bs[4], beta[4], tc[4] = { }, all_zero_bs = 1; + int32_t bs[4], beta[4], tc[4] = { 0 }, all_zero_bs = 1; uint8_t max_len_p[4], max_len_q[4]; for (int i = 0; i < DEBLOCK_STEP >> (2 - vs); i++) {