This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 08cd8df29d17b4302a105aab80a41b885dd42663 Author: Kacper Michajłow <[email protected]> AuthorDate: Sun Sep 6 03:33:50 2026 +0200 Commit: Kacper Michajłow <[email protected]> CommitDate: Tue Sep 8 20:00:11 2026 +0000 fftools/textformat: do not terminate the parent's line twice The parent's footer emitted a newline after its member rows, leaving a blank line in compact output and an empty record in csv. Signed-off-by: Kacper Michajłow <[email protected]> --- fftools/textformat/tf_compact.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/fftools/textformat/tf_compact.c b/fftools/textformat/tf_compact.c index 9cb89b3fe9..4b4db7bca2 100644 --- a/fftools/textformat/tf_compact.c +++ b/fftools/textformat/tf_compact.c @@ -194,10 +194,16 @@ static void compact_print_section_header(AVTextFormatContext *wctx, const void * wctx->nb_item[wctx->level] = wctx->nb_item[wctx->level - 1]; } else { if (parent_section && !(parent_section->flags & (AV_TEXTFORMAT_SECTION_FLAG_IS_WRAPPER | AV_TEXTFORMAT_SECTION_FLAG_IS_ARRAY))) { - if (section->flags & AV_TEXTFORMAT_SECTION_FLAG_IS_ARRAY && !array_has_inline_elems(wctx, section)) - writer_w8(wctx, '\n'); - else if (wctx->level && wctx->nb_item[wctx->level - 1]) + int *parent_open = &compact->terminate_line[wctx->level - 1]; + if (section->flags & AV_TEXTFORMAT_SECTION_FLAG_IS_ARRAY && !array_has_inline_elems(wctx, section)) { + /* Row elements end the parent's line, its footer must not do it again. */ + if (*parent_open) + writer_w8(wctx, '\n'); + *parent_open = 0; + } else if (wctx->level && wctx->nb_item[wctx->level - 1]) { writer_w8(wctx, compact->item_sep); + *parent_open = 1; + } } if (compact->print_section && !(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]
