[FFmpeg-cvslog] ffserver: reflow rtsp_cmd_setup()

[Reynaldo H. Verdejo Pinochet]

ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Sat Jan  3 20:12:15 2015 -0300| [ac1940b2ba7d999f2da6100a2cf6cab30e216f3e] | committer: Reynaldo H. Verdejo Pinochet

ffserver: reflow rtsp_cmd_setup()

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

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

 ffserver.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 8f564ab..129eb30 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2937,8 +2937,10 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url,
 
     /* now check each stream */
     for(stream = config.first_stream; stream; stream = stream->next) {
-        if (!stream->is_feed &&
-            stream->fmt && !strcmp(stream->fmt->name, "rtp")) {
+        if (stream->is_feed || !stream->fmt ||
+            strcmp(stream->fmt->name, "rtp")) {
+            continue;
+        }
             /* accept aggregate filenames only if single stream */
             if (!strcmp(path, stream->filename)) {
                 if (stream->nb_streams != 1) {
@@ -2956,7 +2958,6 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url,
                 if (!strcmp(path, buf))
                     goto found;
             }
-        }
     }
     /* no stream found */
     rtsp_reply_error(c, RTSP_STATUS_SERVICE); /* XXX: right error ? */