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 14DBE48C6E for ; Tue, 23 Jan 2024 22:29:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 483AF68CFE2; Wed, 24 Jan 2024 00:29:27 +0200 (EET) Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A62B668C9F8 for ; Wed, 24 Jan 2024 00:29:20 +0200 (EET) Received: by mail-ot1-f44.google.com with SMTP id 46e09a7af769-6dbc2bf4e8dso976043a34.1 for ; Tue, 23 Jan 2024 14:29:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706048959; x=1706653759; 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=oHO/uJlgz4YynA03XnMPSx3HMm8965dBNFYwWChFsEg=; b=EjQWaxoYYOL7PP4zcWvlKZMxvsb54mmQK6rlXqLANp+IeGnd6aouVi7V9cA8jBNyG4 /FsPlB6QLH4b+cXFPBFC9V54iqJeOqja81RwMlpH7t1OoujFqSplv41Ktgoae8ybgLuk mS3oyHD6jwxLd3MItBfyoyRbSv6gZaI6bdUt36lxBJv6iHkMUxKpU3eqF/u7WYE/3Mwn D1PKYnVutVIjyP1Zb1bS9mflYhlTbMs0XKRqNI128TZggvwjcY7CfTg+KIXGLQAPXUby JbhmV3vWlYHROHOdAbtQNmVZ2cY5a0ogxCv6IHGaRwYJ17o/I6DZ2nv8P4ms9S3+b3N9 UGlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706048959; x=1706653759; 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=oHO/uJlgz4YynA03XnMPSx3HMm8965dBNFYwWChFsEg=; b=wNt50Gab/PkobkLjchaa55gv7AjRmKYtqNgylr9ZgxP6NLChb4dMzYE70WIeQhGW4N RCHK3YYUmWmL3kB1atC8ps16JQF1Wx6+PxtxnsIUkSN+f9HKk21aktCrrLmfQUaYSRrd 7ZASbLSnESOsejKGyNktL2W67RbII2o+WQh3qekr0TRCMNTzyNBytjGactEblL5zm0VO /M2PgkWDrbDZRp5zhQ7Hff8E5QqyU1GY/hDxFRpIz5InDD+VRU9aS5J9MBP34IM3dCMH mmZs6NU0CpHDEsi9ONztBq1IN+WGktt575cCZKAVpucUHvrCovgfzkkxEiPn9YvvC4nV IHDQ== X-Gm-Message-State: AOJu0Yz0NjJaIeo2wknWHQftsbmm3Sw6MqDSBgZNRrEizn64N/JhZ3HD PqhDHXqs4dqc0Ej4yLlz1qEGSxtUdWdFw8+bpdh7CUJfN1Y+AHaAVXKmLJqy X-Google-Smtp-Source: AGHT+IEzWWM71dUlfDDKP7hk0UT+2nLpO4WGd6mTsUpZQwBVaZNhAgoBWd4+G1cU+sM7A1aLtqi8qg== X-Received: by 2002:a4a:bd89:0:b0:599:2b86:993 with SMTP id k9-20020a4abd89000000b005992b860993mr668693oop.0.1706048958834; Tue, 23 Jan 2024 14:29:18 -0800 (PST) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id z15-20020a0cfc0f000000b0067f2559fd5esm3862489qvo.34.2024.01.23.14.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 14:29:18 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Jan 2024 17:29:14 -0500 Message-ID: <20240123222914.235662-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libjxl.h: include version.h 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: Leo Izen 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: This file has been exported since our minimum required version (0.7.0), but it wasn't documented. Instead it was transitively included by (but not jxl/encode.h), which ffmpeg relied on. libjxl broke its API in libjxl/libjxl@66b959239355aef5255 by removing the transitive include of version.h, and they do not plan on adding it back. Instead they are choosing to leave the API backwards- incompatible with downstream callers written for some fairly recent versions of their API. As a result, we include to continue to build against more recent versions of libjxl. The version macros removed are also present in that file, so we no longer need to redefine them. Signed-off-by: Leo Izen --- libavcodec/libjxl.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/libavcodec/libjxl.h b/libavcodec/libjxl.h index e305b6e758..0b983a122f 100644 --- a/libavcodec/libjxl.h +++ b/libavcodec/libjxl.h @@ -27,19 +27,8 @@ #ifndef AVCODEC_LIBJXL_H #define AVCODEC_LIBJXL_H -#include #include - -/* - * libjxl version 0.7.0 and earlier doesn't contain these macros at all - * so to detect version 0.7.0 versus 0.8.0 we need to define them ourselves - */ -#ifndef JPEGXL_COMPUTE_NUMERIC_VERSION - #define JPEGXL_COMPUTE_NUMERIC_VERSION(major,minor,patch) ((major<<24) | (minor<<16) | (patch<<8) | 0) -#endif -#ifndef JPEGXL_NUMERIC_VERSION - #define JPEGXL_NUMERIC_VERSION JPEGXL_COMPUTE_NUMERIC_VERSION(0, 7, 0) -#endif +#include /** * Transform threadcount in ffmpeg to one used by libjxl. -- 2.43.0 _______________________________________________ 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".