This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 4269d69df1858cd24e1dee191360cabb7632c60f Author: James Almer <[email protected]> AuthorDate: Sun Dec 14 14:10:36 2025 -0300 Commit: James Almer <[email protected]> CommitDate: Sun Dec 14 18:22:04 2025 -0300 avcodec/libsvtjpegxsdec: use AVCodecContext.lowres instead of a private option It was evidently an oversight. Found-by: Andreas Rheinhardt. Signed-off-by: James Almer <[email protected]> --- libavcodec/libsvtjpegxsdec.c | 24 +++--------------------- libavcodec/version.h | 2 +- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/libavcodec/libsvtjpegxsdec.c b/libavcodec/libsvtjpegxsdec.c index 65a5abcc0d..c0ca447532 100644 --- a/libavcodec/libsvtjpegxsdec.c +++ b/libavcodec/libsvtjpegxsdec.c @@ -37,7 +37,6 @@ #include "profiles.h" typedef struct SvtJpegXsDecodeContext { - AVClass* class; svt_jpeg_xs_image_config_t config; svt_jpeg_xs_decoder_api_t decoder; svt_jpeg_xs_frame_t input; @@ -197,9 +196,9 @@ static av_cold int svt_jpegxs_dec_init(AVCodecContext* avctx) svt_dec->decoder.verbose = log_level < AV_LOG_DEBUG ? VERBOSE_ERRORS : log_level == AV_LOG_DEBUG ? VERBOSE_SYSTEM_INFO : VERBOSE_WARNINGS; - if (svt_dec->proxy_mode == 1) + if (avctx->lowres == 1) svt_dec->decoder.proxy_mode = proxy_mode_half; - else if (svt_dec->proxy_mode == 2) + else if (avctx->lowres == 2) svt_dec->decoder.proxy_mode = proxy_mode_quarter; else svt_dec->decoder.proxy_mode = proxy_mode_full; @@ -211,23 +210,6 @@ static av_cold int svt_jpegxs_dec_init(AVCodecContext* avctx) return 0; } -#define OFFSET(x) offsetof(SvtJpegXsDecodeContext, x) -#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM -static const AVOption svtjpegxs_dec_options[] = { - { "proxy_mode", "Resolution scaling mode", OFFSET(proxy_mode), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 2, VE, .unit = "proxy_mode" }, - { "full", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 0}, INT_MIN, INT_MAX, VE, .unit = "proxy_mode" }, - { "half", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 1}, INT_MIN, INT_MAX, VE, .unit = "proxy_mode" }, - { "quarter", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 2}, INT_MIN, INT_MAX, VE, .unit = "proxy_mode" }, - {NULL}, -}; - -static const AVClass svtjpegxs_dec_class = { - .class_name = "libsvtjpegxsdec", - .item_name = av_default_item_name, - .option = svtjpegxs_dec_options, - .version = LIBAVUTIL_VERSION_INT, -}; - const FFCodec ff_libsvtjpegxs_decoder = { .p.name = "libsvtjpegxs", CODEC_LONG_NAME("SVT JPEG XS(Scalable Video Technology for JPEG XS) decoder"), @@ -241,6 +223,6 @@ const FFCodec ff_libsvtjpegxs_decoder = { .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_AUTO_THREADS, + .p.max_lowres = 2, .p.wrapper_name = "libsvtjpegxs", - .p.priv_class = &svtjpegxs_dec_class, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 728ab8839d..3af30cdc3b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 23 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
