aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-05-29 18:08:00 +0200
committerStefano Sabatini <stefasab@gmail.com>2012-05-29 18:11:36 +0200
commitad381ac97fadaab681075ef9331e917683805233 (patch)
tree8df0fea6e37acbf23b8a2c2fd7718167ed243880
parenta5e83a5d4c7d42c4035b8277ac13a64a6959a6f0 (diff)
downloadffmpeg-ad381ac97fadaab681075ef9331e917683805233.tar.gz
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
-rw-r--r--ffprobe.c6
1 files changed, 3 insertions, 3 deletions
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,