This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 3534de976cb2285e771d20d22b9be99ce78223c1 Author: Kacper Michajłow <[email protected]> AuthorDate: Thu Oct 8 03:38:25 2026 +0200 Commit: James Almer <[email protected]> CommitDate: Sat Oct 10 13:44:14 2026 +0000 fftools/textformat: derive the default writer's nesting from the section flags The per-level flag was set for nested sections and never cleared. Signed-off-by: Kacper Michajłow <[email protected]> --- fftools/textformat/tf_default.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/fftools/textformat/tf_default.c b/fftools/textformat/tf_default.c index 78a463dd49..22e4d44412 100644 --- a/fftools/textformat/tf_default.c +++ b/fftools/textformat/tf_default.c @@ -36,7 +36,6 @@ typedef struct DefaultContext { const AVClass *class; int nokey; int noprint_wrappers; - int nested_section[SECTION_MAX_NB_LEVELS]; } DefaultContext; #undef OFFSET @@ -63,27 +62,32 @@ static inline char *upcase_string(char *dst, size_t dst_size, const char *src) return dst; } +static int default_is_nested(AVTextFormatContext *wctx) +{ + const AVTextFormatSection *parent_section = tf_get_parent_section(wctx, wctx->level); + + return parent_section && + !(parent_section->flags & (AV_TEXTFORMAT_SECTION_FLAG_IS_WRAPPER | AV_TEXTFORMAT_SECTION_FLAG_IS_ARRAY)); +} + static void default_print_section_header(AVTextFormatContext *wctx, const void *data) { DefaultContext *def = wctx->priv; char buf[32]; const AVTextFormatSection *section = tf_get_section(wctx, wctx->level); - const AVTextFormatSection *parent_section = tf_get_parent_section(wctx, wctx->level); + int nested = default_is_nested(wctx); if (!section) return; av_bprint_clear(&wctx->section_pbuf[wctx->level]); - if (parent_section && - !(parent_section->flags & (AV_TEXTFORMAT_SECTION_FLAG_IS_WRAPPER | AV_TEXTFORMAT_SECTION_FLAG_IS_ARRAY))) { - def->nested_section[wctx->level] = 1; + if (nested) av_bprintf(&wctx->section_pbuf[wctx->level], "%s%s:", wctx->section_pbuf[wctx->level - 1].str, upcase_string(buf, sizeof(buf), av_x_if_null(section->element_name, section->name))); - } - if (def->noprint_wrappers || def->nested_section[wctx->level]) + if (def->noprint_wrappers || nested) return; if (!(section->flags & (AV_TEXTFORMAT_SECTION_FLAG_IS_WRAPPER | AV_TEXTFORMAT_SECTION_FLAG_IS_ARRAY))) @@ -100,7 +104,7 @@ static void default_print_section_footer(AVTextFormatContext *wctx) if (!section) return; - if (def->noprint_wrappers || def->nested_section[wctx->level]) + if (def->noprint_wrappers || default_is_nested(wctx)) return; if (!(section->flags & (AV_TEXTFORMAT_SECTION_FLAG_IS_WRAPPER | AV_TEXTFORMAT_SECTION_FLAG_IS_ARRAY))) -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
