From 90347dabc8a41c03e4d282c301de917cd9b9e21b Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Thu, 29 Dec 2011 12:50:25 +0100
Subject: [PATCH] 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.
---
ffprobe.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ffprobe.c b/ffprobe.c
index ddeaeee7b87..42832d7390a 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -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:
--
GitLab