highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename "fd1" variable ro "fd". There were previously two variables (fd1 and

Browse Source 
fd2) and one was just removed, so naming the other "fd1" is counter-intuitive.
See "[RFC] rtsp.c EOF support" thread.

Originally committed as revision 17780 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje
2009-03-03 17:06:18 +00:00
parent f0a8039464
commit bc8763cda9
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/rtsp.c
View File

@ -1305,7 +1305,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
RTSPState *rt = s->priv_data; RTSPState *rt = s->priv_data;
RTSPStream *rtsp_st; RTSPStream *rtsp_st;
fd_set rfds; fd_set rfds;
int fd1, fd_max, n, i, ret; int fd, fd_max, n, i, ret;
struct timeval tv; struct timeval tv;
for(;;) { for(;;) {
@ -1318,10 +1318,10 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
if (rtsp_st->rtp_handle) { if (rtsp_st->rtp_handle) {
/* currently, we cannot probe RTCP handle because of /* currently, we cannot probe RTCP handle because of
* blocking restrictions */ * blocking restrictions */
fd1 = url_get_file_handle(rtsp_st->rtp_handle); fd = url_get_file_handle(rtsp_st->rtp_handle);
if (fd1 > fd_max) if (fd > fd_max)
fd_max = fd1; fd_max = fd;
FD_SET(fd1, &rfds); FD_SET(fd, &rfds);
} }
} }
tv.tv_sec = 0; tv.tv_sec = 0;
@ -1331,8 +1331,8 @@ 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) {
fd1 = url_get_file_handle(rtsp_st->rtp_handle); fd = url_get_file_handle(rtsp_st->rtp_handle);
if (FD_ISSET(fd1, &rfds)) { if (FD_ISSET(fd, &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;