This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 9bbe1ec86ffcd3966446e8b428779e5e6414d4f8 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Mon Mar 9 07:12:09 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Thu Mar 12 18:26:42 2026 +0100 avutil/opt: Remove obsolete LIBAVUTIL_VERSION_MAJOR checks Removing them has been forgotten during the lavu 59->60 bump. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavutil/opt.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 7c6a01068a..fca8772c18 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -191,20 +191,12 @@ static int opt_set_init(void *obj, const char *name, int search_flags, // try state flags first from the target (child), then from its parent class = *(const AVClass**)tgt; - if ( -#if LIBAVUTIL_VERSION_MAJOR < 60 - class->version >= AV_VERSION_INT(59, 41, 100) && -#endif - class->state_flags_offset) + if (class->state_flags_offset) state_flags = (unsigned*)((uint8_t*)tgt + class->state_flags_offset); if (!state_flags && obj != tgt) { class = *(const AVClass**)obj; - if ( -#if LIBAVUTIL_VERSION_MAJOR < 60 - class->version >= AV_VERSION_INT(59, 41, 100) && -#endif - class->state_flags_offset) + if (class->state_flags_offset) state_flags = (unsigned*)((uint8_t*)obj + class->state_flags_offset); } @@ -212,9 +204,7 @@ static int opt_set_init(void *obj, const char *name, int search_flags, av_log(obj, AV_LOG_ERROR, "Option '%s' is not a runtime option and " "so cannot be set after the object has been initialized\n", o->name); -#if LIBAVUTIL_VERSION_MAJOR >= 60 return AVERROR(EINVAL); -#endif } } _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
