summaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2015-01-03 20:12:15 -0300
committerReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2015-01-03 20:22:45 -0300
commitac1940b2ba7d999f2da6100a2cf6cab30e216f3e (patch)
treebf799f954f2777ee804aa115844d1eab479307da /ffserver.c
parent196bc03a869a8744612e5355efee119a03578ec3 (diff)
downloadffmpeg-streaming-ac1940b2ba7d999f2da6100a2cf6cab30e216f3e.zip
ffmpeg-streaming-ac1940b2ba7d999f2da6100a2cf6cab30e216f3e.tar.gz
ffserver: reflow rtsp_cmd_setup()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c7
1 files 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 ? */
OpenPOWER on IntegriCloud