From 205092bf478f444fb8e6f4d0f45f07fac27be352 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Thu, 27 Jun 2013 00:09:49 +0200
Subject: [PATCH] ffprobe: simplify branching logic in probe_file()
---
ffprobe.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ffprobe.c b/ffprobe.c
index 98c4a4987c1..d2a682b23a2 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1904,7 +1904,10 @@ static int probe_file(WriterContext *wctx, const char *filename)
do_read_packets = do_show_packets || do_count_packets;
ret = open_input_file(&fmt_ctx, filename);
- if (ret >= 0) {
+ if (ret < 0)
+ return ret;
+
+ /* todo: reindent */
nb_streams_frames = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_frames));
nb_streams_packets = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_packets));
selected_streams = av_calloc(fmt_ctx->nb_streams, sizeof(*selected_streams));
@@ -1949,7 +1952,7 @@ static int probe_file(WriterContext *wctx, const char *filename)
av_freep(&nb_streams_frames);
av_freep(&nb_streams_packets);
av_freep(&selected_streams);
- }
+
return ret;
}
--
GitLab