RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffserver: reflow rtsp_cmd_setup() 

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2015-01-03 20:12:15 -03:00
parent 196bc03a86
commit ac1940b2ba
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ffserver.c
View File

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