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.