Commit 26f8e2a9 authored by rbultje's avatar rbultje

Reindent after r17777.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17778 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 6f63b87b
...@@ -927,7 +927,7 @@ make_setup_request (AVFormatContext *s, const char *host, int port, ...@@ -927,7 +927,7 @@ make_setup_request (AVFormatContext *s, const char *host, int port,
} else } else
rtsp_st = rt->rtsp_streams[i > rtx ? i : i - 1]; rtsp_st = rt->rtsp_streams[i > rtx ? i : i - 1];
} else } else
rtsp_st = rt->rtsp_streams[i]; rtsp_st = rt->rtsp_streams[i];
/* RTP/UDP */ /* RTP/UDP */
if (lower_transport == RTSP_LOWER_TRANSPORT_UDP) { if (lower_transport == RTSP_LOWER_TRANSPORT_UDP) {
...@@ -1316,11 +1316,12 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, ...@@ -1316,11 +1316,12 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
for(i = 0; i < rt->nb_rtsp_streams; i++) { for(i = 0; i < rt->nb_rtsp_streams; i++) {
rtsp_st = rt->rtsp_streams[i]; rtsp_st = rt->rtsp_streams[i];
if (rtsp_st->rtp_handle) { if (rtsp_st->rtp_handle) {
/* currently, we cannot probe RTCP handle because of blocking restrictions */ /* currently, we cannot probe RTCP handle because of
rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2); * blocking restrictions */
if (fd1 > fd_max) rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2);
fd_max = fd1; if (fd1 > fd_max)
FD_SET(fd1, &rfds); fd_max = fd1;
FD_SET(fd1, &rfds);
} }
} }
tv.tv_sec = 0; tv.tv_sec = 0;
...@@ -1330,15 +1331,15 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, ...@@ -1330,15 +1331,15 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
for(i = 0; i < rt->nb_rtsp_streams; i++) { for(i = 0; i < rt->nb_rtsp_streams; i++) {
rtsp_st = rt->rtsp_streams[i]; rtsp_st = rt->rtsp_streams[i];
if (rtsp_st->rtp_handle) { if (rtsp_st->rtp_handle) {
rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2); rtp_get_file_handles(rtsp_st->rtp_handle, &fd1, &fd2);
if (FD_ISSET(fd1, &rfds)) { if (FD_ISSET(fd1, &rfds)) {
ret = url_read(rtsp_st->rtp_handle, buf, buf_size); ret = url_read(rtsp_st->rtp_handle, buf, buf_size);
if (ret > 0) { if (ret > 0) {
*prtsp_st = rtsp_st; *prtsp_st = rtsp_st;
return ret; return ret;
}
} }
} }
}
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment