[FFmpeg-cvslog] ffserver: make statement block unconditional by exiting early

Reynaldo H. Verdejo Pinochet git at videolan.org
Thu Jun 25 00:18:30 CEST 2015


ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Wed Jun 24 18:57:42 2015 -0300| [36a617c1625d5b05afa00e24c5e6291eb64c2bdf] | committer: Reynaldo H. Verdejo Pinochet

ffserver: make statement block unconditional by exiting early

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36a617c1625d5b05afa00e24c5e6291eb64c2bdf
---

 ffserver.c |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 1be545f..b9b6d96 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]);
         }
     }
 



More information about the ffmpeg-cvslog mailing list