From ad381ac97fadaab681075ef9331e917683805233 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 29 May 2012 18:08:00 +0200 Subject: ffprobe: fix chapter printing, fix JSON output Make writer_print_chapter_header() set the internal values *before* the private writer callback is called, otherwise the accessed internal values will be wrong. Fix regression introduced in fa6cb2fdffe. Found-By: Daemon404 --- ffprobe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ffprobe.c') diff --git a/ffprobe.c b/ffprobe.c index 2727dd7498..afc088320d 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -252,14 +252,14 @@ static inline void writer_print_footer(WriterContext *wctx) static inline void writer_print_chapter_header(WriterContext *wctx, const char *chapter) { - if (wctx->writer->print_chapter_header) - wctx->writer->print_chapter_header(wctx, chapter); wctx->nb_section = 0; - wctx->multiple_sections = !strcmp(chapter, "packets") || !strcmp(chapter, "frames" ) || !strcmp(chapter, "packets_and_frames") || !strcmp(chapter, "streams") || !strcmp(chapter, "library_versions"); wctx->is_fmt_chapter = !strcmp(chapter, "format"); + + if (wctx->writer->print_chapter_header) + wctx->writer->print_chapter_header(wctx, chapter); } static inline void writer_print_chapter_footer(WriterContext *wctx, -- cgit v1.2.3