From 36a617c1625d5b05afa00e24c5e6291eb64c2bdf Mon Sep 17 00:00:00 2001
From: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Date: Wed, 24 Jun 2015 18:57:42 -0300
Subject: [PATCH] ffserver: make statement block unconditional by exiting early
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
---
ffserver.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 1be545f9091..b9b6d9661e8 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3594,16 +3594,17 @@ static void build_feed_streams(void)
/* gather all streams */
for(stream = config.first_stream; stream; stream = stream->next) {
feed = stream->feed;
- if (feed) {
- if (stream->is_feed) {
- for(i=0;i<stream->nb_streams;i++)
- stream->feed_streams[i] = i;
- } else {
- /* we handle a stream coming from a feed */
- for(i=0;i<stream->nb_streams;i++)
- stream->feed_streams[i] = add_av_stream(feed,
- stream->streams[i]);
- }
+ if (!feed)
+ continue;
+
+ if (stream->is_feed) {
+ for(i=0;i<stream->nb_streams;i++)
+ stream->feed_streams[i] = i;
+ } else {
+ /* we handle a stream coming from a feed */
+ for(i=0;i<stream->nb_streams;i++)
+ stream->feed_streams[i] = add_av_stream(feed,
+ stream->streams[i]);
}
}
--
GitLab