diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2009-03-03 16:53:04 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2009-03-03 16:53:04 +0000 |
| commit | 2fea965070a96a04a46513cc524ac4cfcf622fd8 (patch) | |
| tree | 8efa924f3948e65c3cc83dad2f102024ce66cc8d /libavformat | |
| parent | f830c9a487510cc4ad6c33ef46e05db52865dd16 (diff) | |
| download | ffmpeg-2fea965070a96a04a46513cc524ac4cfcf622fd8.tar.gz | |
Reindent after r17777.
Originally committed as revision 17778 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtsp.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index f47f8b183e..7c9242d01f 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -927,7 +927,7 @@ make_setup_request (AVFormatContext *s, const char *host, int port, } else rtsp_st = rt->rtsp_streams[i > rtx ? i : i - 1]; } else - rtsp_st = rt->rtsp_streams[i]; + rtsp_st = rt->rtsp_streams[i]; /* RTP/UDP */ if (lower_transport == RTSP_LOWER_TRANSPORT_UDP) { @@ -1316,11 +1316,12 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, for(i = 0; i < rt->nb_rtsp_streams; i++) { rtsp_st = rt->rtsp_streams[i]; if (rtsp_st->rtp_handle) { - /* currently, we cannot probe RTCP handle because of blocking restrictions */ - rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2); - if (fd1 > fd_max) - fd_max = fd1; - FD_SET(fd1, &rfds); + /* currently, we cannot probe RTCP handle because of + * blocking restrictions */ + rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2); + if (fd1 > fd_max) + fd_max = fd1; + FD_SET(fd1, &rfds); } } tv.tv_sec = 0; @@ -1330,15 +1331,15 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, for(i = 0; i < rt->nb_rtsp_streams; i++) { rtsp_st = rt->rtsp_streams[i]; if (rtsp_st->rtp_handle) { - rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2); - if (FD_ISSET(fd1, &rfds)) { - ret = url_read(rtsp_st->rtp_handle, buf, buf_size); - if (ret > 0) { - *prtsp_st = rtsp_st; - return ret; + rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2); + if (FD_ISSET(fd1, &rfds)) { + ret = url_read(rtsp_st->rtp_handle, buf, buf_size); + if (ret > 0) { + *prtsp_st = rtsp_st; + return ret; + } } } - } } } } |