Commit 90347dab authored by Stefano Sabatini's avatar Stefano Sabatini

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.
parent c972f91d
...@@ -1399,16 +1399,16 @@ static int probe_file(const char *filename) ...@@ -1399,16 +1399,16 @@ static int probe_file(const char *filename)
if ((ret = writer_open(&wctx, w, w_args, NULL)) < 0) if ((ret = writer_open(&wctx, w, w_args, NULL)) < 0)
goto end; goto end;
if ((ret = open_input_file(&fmt_ctx, filename)))
goto end;
writer_print_header(wctx); writer_print_header(wctx);
ret = open_input_file(&fmt_ctx, filename);
if (ret >= 0) {
PRINT_CHAPTER(packets); PRINT_CHAPTER(packets);
PRINT_CHAPTER(streams); PRINT_CHAPTER(streams);
PRINT_CHAPTER(format); PRINT_CHAPTER(format);
writer_print_footer(wctx);
avformat_close_input(&fmt_ctx); avformat_close_input(&fmt_ctx);
}
writer_print_footer(wctx);
writer_close(&wctx); writer_close(&wctx);
end: end:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment