har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffprobe: fix chapter printing, fix JSON output

Browse Source 
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
This commit is contained in:
Stefano Sabatini 2012-05-29 18:08:00 +02:00
parent a5e83a5d4c
commit ad381ac97f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffprobe.c
View File

@ -252,14 +252,14 @@ static inline void writer_print_footer(WriterContext *wctx)
static inline void writer_print_chapter_header(WriterContext *wctx, static inline void writer_print_chapter_header(WriterContext *wctx,
const char *chapter) const char *chapter)
{ {
if (wctx->writer->print_chapter_header)
wctx->writer->print_chapter_header(wctx, chapter);
wctx->nb_section = 0; wctx->nb_section = 0;
wctx->multiple_sections = !strcmp(chapter, "packets") || !strcmp(chapter, "frames" ) || wctx->multiple_sections = !strcmp(chapter, "packets") || !strcmp(chapter, "frames" ) ||
!strcmp(chapter, "packets_and_frames") || !strcmp(chapter, "packets_and_frames") ||
!strcmp(chapter, "streams") || !strcmp(chapter, "library_versions"); !strcmp(chapter, "streams") || !strcmp(chapter, "library_versions");
wctx->is_fmt_chapter = !strcmp(chapter, "format"); 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, static inline void writer_print_chapter_footer(WriterContext *wctx,