From patchwork Mon Aug 28 07:14:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 43364 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7194:b0:149:dfde:5c0a with SMTP id s20csp1190231pzb; Mon, 28 Aug 2023 00:19:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH1IxV3Y1Jj2MRVoLAjdnu69kgU6jc4YXDHkm3W8ExjSb7JA4s5oGsxVLHpT77gSd0rvkht X-Received: by 2002:a17:907:7da3:b0:982:a022:a540 with SMTP id oz35-20020a1709077da300b00982a022a540mr26694231ejc.11.1693207174572; Mon, 28 Aug 2023 00:19:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693207174; cv=none; d=google.com; s=arc-20160816; b=HchTyMu//Ojv7t7MLkHCezqNoPHqQLLT9xbbBM1e/XAHbBV78+/a87fPWmzIQCUYqz 6jCa14yWPwC9RyEFKTRuMTA4EAgxtqBIRowAThqxIeQ3PCjO7uSeKc7JtEe8vl9iw8Fs +sCrRIbdQnsQzvSAR4w2ZjDCDjoVu8namdKZpkErjf/1aesO5tEOHRMUnGiKkalOYPLc Ef16TJ/3vwj9573H3DfR7oQCcMlcy6C06wDueyrdPQDTp3F7fCfpqciJtko/n2g658ZB ng4TTnIos25WIIxPN0sTkCHTF2Fzg/zWKlxUxbMeEXRGrSXMOMwxD3kA/2wzVxSnP/2Y Co7Q== 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=SUTGfnh69Ok6aFrjtusFiS8Pe8aeWvqJaWxDqufj71w=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=e9tSDJG3EqCTlpdFbBf2L6X0gHcYLSwmXR92Z+bQhIULCYpNaXK05B8dk95cXifFlv e5LFUMe16DoJ1FRyudLSs1CuaL8AolXPDhhZfee3jVg91QMlVUKqkNw1uCKBYBvTFwnR LnLUNHvXRblMcmn7CBFCsYA4AT0rIHYATSkSgSshZlH7KscQO2OLncdjg1pbK8KhvqZU wVIgg37SRVnjjzEfIbKc6DsMIK13YdqaB0+tKTvlasUdwLfDPvy6rqNqEYx0MvXCbBwD 1jwqLK55SYFmXEVn3nfUhoNYZjx+QLQnGXhWhp1dNqqLGEh1kJwtt9xkfGbcdKCfaL2z Gf6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=HB068v2E; 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 lf9-20020a170907174900b009930d4e327dsi4025430ejc.880.2023.08.28.00.19.34; Mon, 28 Aug 2023 00:19:34 -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=@intel.com header.s=Intel header.b=HB068v2E; 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 91CCF68068C; Mon, 28 Aug 2023 10:19:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3106768068C for ; Mon, 28 Aug 2023 10:19:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693207169; x=1724743169; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=DLjvCnlyfDlge+DNMwjG89ZsIe5rFYwSEYKLWng8kUM=; b=HB068v2EBmeYU2y5Ab4knposa3C6YYTo13aNvC/5hWs3RQeQ4+n068NQ qr7Zo+toAVfy9PN8e5KOyF+7+Y39/EN8JJSf+KAASV0uFGiGN8eH/lgn6 +xmPsgC1dCDXj5o8zwhSQAoaBidpgNZGBNQ57sqT6ynBPa9sv8w56mG2V okP6G2UiEdbj0YIxHEYSLnxC0cQ7PwYDBls8/cL97AvRL+LdfGY7TwSil gqmY3ytiyxoA675IcpSDgLJayFMJZQzH99bXiN4Lw9YYxJNXjtUMYHXah 20e8dkw0urzFXZCek/lLlBxEuek40Y2FFBgS9ZBM5A7S+afbMCGjfr2Lc g==; X-IronPort-AV: E=McAfee;i="6600,9927,10815"; a="355361763" X-IronPort-AV: E=Sophos;i="6.02,207,1688454000"; d="scan'208";a="355361763" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Aug 2023 00:19:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10815"; a="808181690" X-IronPort-AV: E=Sophos;i="6.02,207,1688454000"; d="scan'208";a="808181690" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by fmsmga004.fm.intel.com with ESMTP; 28 Aug 2023 00:19:08 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Aug 2023 15:14:11 +0800 Message-ID: <20230828071411.1695-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/jpegxl_parser: fix a compile error 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UtO195yF6+iG Compiler: MSVC 14.35.32215 Error type: error C2099: initializer is not a constant Related commit: 0c0dd23 avcodec/jpegxl_parser: add JPEG XL parser Signed-off-by: Tong Wu --- libavcodec/jpegxl_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c index 66e64b1074..20c8a41a89 100644 --- a/libavcodec/jpegxl_parser.c +++ b/libavcodec/jpegxl_parser.c @@ -49,7 +49,7 @@ #define clog1p(x) (ff_log2(x) + !!(x)) #define unpack_signed(x) (((x) & 1 ? -(x)-1 : (x))/2) #define div_ceil(x, y) (((x) - 1) / (y) + 1) -#define vlm(a,b) (VLCElem){.sym = (a), .len = (b)} +#define vlm(a,b) {.sym = (a), .len = (b)} typedef struct JXLHybridUintConf { int split_exponent;