diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2008-03-19 14:08:16 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2008-03-19 14:08:16 +0000 |
| commit | 7e6ca34f2742515fee09a2af0af627e8fcc0cf27 (patch) | |
| tree | f833c1615459abaacace4160eec1a023a6acc82f /libavformat | |
| parent | 8792f52a9b60a5563aedb2cc98882895a0e54789 (diff) | |
Reindent after rtsp-alternate-protocol* patches.
Originally committed as revision 12506 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtsp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index cd5ec8f445..1431bc08d3 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -925,9 +925,8 @@ make_setup_request (AVFormatContext *s, const char *host, int port, int protocol if (reply->status_code == 461 /* Unsupported protocol */ && i == 0) { err = 1; goto fail; - } else - if (reply->status_code != RTSP_STATUS_OK || - reply->nb_transports != 1) { + } else if (reply->status_code != RTSP_STATUS_OK || + reply->nb_transports != 1) { err = AVERROR_INVALIDDATA; goto fail; } @@ -1092,7 +1091,7 @@ static int rtsp_read_header(AVFormatContext *s, err = make_setup_request(s, host, port, protocol); if (err < 0) - goto fail; + goto fail; protocol_mask &= ~(1 << protocol); if (protocol_mask == 0 && err == 1) { err = AVERROR(EPROTONOSUPPORT); |