[FFmpeg-cvslog] ffserver: reindent rtsp_cmd_setup()

Reynaldo H. Verdejo Pinochet git at videolan.org
Sun Jan 4 00:27:33 CET 2015


ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Sat Jan  3 20:17:28 2015 -0300| [997508847215a852d2f5d564e641f38f8bd93c46] | committer: Reynaldo H. Verdejo Pinochet

ffserver: reindent 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=997508847215a852d2f5d564e641f38f8bd93c46
---

 ffserver.c |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 129eb30..c4cf390 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2941,23 +2941,23 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url,
             strcmp(stream->fmt->name, "rtp")) {
             continue;
         }
-            /* accept aggregate filenames only if single stream */
-            if (!strcmp(path, stream->filename)) {
-                if (stream->nb_streams != 1) {
-                    rtsp_reply_error(c, RTSP_STATUS_AGGREGATE);
-                    return;
-                }
-                stream_index = 0;
-                goto found;
+        /* accept aggregate filenames only if single stream */
+        if (!strcmp(path, stream->filename)) {
+            if (stream->nb_streams != 1) {
+                rtsp_reply_error(c, RTSP_STATUS_AGGREGATE);
+                return;
             }
+            stream_index = 0;
+            goto found;
+        }
 
-            for(stream_index = 0; stream_index < stream->nb_streams;
-                stream_index++) {
-                snprintf(buf, sizeof(buf), "%s/streamid=%d",
-                         stream->filename, stream_index);
-                if (!strcmp(path, buf))
-                    goto found;
-            }
+        for(stream_index = 0; stream_index < stream->nb_streams;
+            stream_index++) {
+            snprintf(buf, sizeof(buf), "%s/streamid=%d",
+                     stream->filename, stream_index);
+            if (!strcmp(path, buf))
+                goto found;
+        }
     }
     /* no stream found */
     rtsp_reply_error(c, RTSP_STATUS_SERVICE); /* XXX: right error ? */



More information about the ffmpeg-cvslog mailing list