Browse Source

ffprobe: change order of operations in probe_file()

This is required by a pending patch, also fixes a memleak due to the
writer context not being closed in case of open_input_file() failure.
tags/n0.10
Stefano Sabatini 13 years ago
parent
commit
90347dabc8
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      ffprobe.c

+ 4
- 4
ffprobe.c View File

@@ -1399,16 +1399,16 @@ static int probe_file(const char *filename)

if ((ret = writer_open(&wctx, w, w_args, NULL)) < 0)
goto end;
if ((ret = open_input_file(&fmt_ctx, filename)))
goto end;

writer_print_header(wctx);
ret = open_input_file(&fmt_ctx, filename);
if (ret >= 0) {
PRINT_CHAPTER(packets);
PRINT_CHAPTER(streams);
PRINT_CHAPTER(format);
writer_print_footer(wctx);

avformat_close_input(&fmt_ctx);
}
writer_print_footer(wctx);
writer_close(&wctx);

end:


Loading…
Cancel
Save