diff options
| author | Martin Storsjö <martin@martin.st> | 2010-11-28 21:17:39 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-11-28 21:17:39 +0000 |
| commit | 0b6a7ff4b424a74e8162b965fb15b033b8ef71ad (patch) | |
| tree | 8530bab6372c91bae8e2a96319fad29bf93f063f | |
| parent | 3fa77bde1b1e977b07070c72a9c2aaa5ad7dbf8d (diff) | |
| download | ffmpeg-0b6a7ff4b424a74e8162b965fb15b033b8ef71ad.tar.gz | |
rtsp: Do a forgotten reindenting
Originally committed as revision 25839 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/rtsp.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index cbb19f42e8..643fde3de4 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -339,24 +339,24 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, av_strlcpy(rt->control_uri, p, sizeof(rt->control_uri)); } else { - char proto[32]; - /* get the control url */ - st = s->streams[s->nb_streams - 1]; - rtsp_st = st->priv_data; + char proto[32]; + /* get the control url */ + st = s->streams[s->nb_streams - 1]; + rtsp_st = st->priv_data; - /* XXX: may need to add full url resolution */ - av_url_split(proto, sizeof(proto), NULL, 0, NULL, 0, - NULL, NULL, 0, p); - if (proto[0] == '\0') { - /* relative control URL */ - if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/') - av_strlcat(rtsp_st->control_url, "/", - sizeof(rtsp_st->control_url)); - av_strlcat(rtsp_st->control_url, p, - sizeof(rtsp_st->control_url)); - } else - av_strlcpy(rtsp_st->control_url, p, - sizeof(rtsp_st->control_url)); + /* XXX: may need to add full url resolution */ + av_url_split(proto, sizeof(proto), NULL, 0, NULL, 0, + NULL, NULL, 0, p); + if (proto[0] == '\0') { + /* relative control URL */ + if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/') + av_strlcat(rtsp_st->control_url, "/", + sizeof(rtsp_st->control_url)); + av_strlcat(rtsp_st->control_url, p, + sizeof(rtsp_st->control_url)); + } else + av_strlcpy(rtsp_st->control_url, p, + sizeof(rtsp_st->control_url)); } } else if (av_strstart(p, "rtpmap:", &p) && s->nb_streams > 0) { /* NOTE: rtpmap is only supported AFTER the 'm=' tag */ |