virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Reindent after rtsp-alternate-protocol* patches.

Browse Source 
Originally committed as revision 12506 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje
2008-03-19 14:08:16 +00:00
parent 8792f52a9b
commit 7e6ca34f27
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/rtsp.c
View File

@@ -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) { if (reply->status_code == 461 /* Unsupported protocol */ && i == 0) {
err = 1; err = 1;
goto fail; goto fail;
} else } else if (reply->status_code != RTSP_STATUS_OK ||
if (reply->status_code != RTSP_STATUS_OK || reply->nb_transports != 1) {
reply->nb_transports != 1) {
err = AVERROR_INVALIDDATA; err = AVERROR_INVALIDDATA;
goto fail; goto fail;
} }
@@ -1092,7 +1091,7 @@ static int rtsp_read_header(AVFormatContext *s,
err = make_setup_request(s, host, port, protocol); err = make_setup_request(s, host, port, protocol);
if (err < 0) if (err < 0)
goto fail; goto fail;
protocol_mask &= ~(1 << protocol); protocol_mask &= ~(1 << protocol);
if (protocol_mask == 0 && err == 1) { if (protocol_mask == 0 && err == 1) {
err = AVERROR(EPROTONOSUPPORT); err = AVERROR(EPROTONOSUPPORT);