From bc8763cda993ef14bf470da3eea174593e3f9bfe Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 3 Mar 2009 17:06:18 +0000 Subject: [PATCH] Rename "fd1" variable ro "fd". There were previously two variables (fd1 and 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 --- libavformat/rtsp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 578ee2413f..27d6277e1b 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1305,7 +1305,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, RTSPState *rt = s->priv_data; RTSPStream *rtsp_st; fd_set rfds; - int fd1, fd_max, n, i, ret; + int fd, fd_max, n, i, ret; struct timeval tv; for(;;) { @@ -1318,10 +1318,10 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, if (rtsp_st->rtp_handle) { /* currently, we cannot probe RTCP handle because of * blocking restrictions */ - fd1 = url_get_file_handle(rtsp_st->rtp_handle); - if (fd1 > fd_max) - fd_max = fd1; - FD_SET(fd1, &rfds); + fd = url_get_file_handle(rtsp_st->rtp_handle); + if (fd > fd_max) + fd_max = fd; + FD_SET(fd, &rfds); } } 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++) { rtsp_st = rt->rtsp_streams[i]; if (rtsp_st->rtp_handle) { - fd1 = url_get_file_handle(rtsp_st->rtp_handle); - if (FD_ISSET(fd1, &rfds)) { + fd = url_get_file_handle(rtsp_st->rtp_handle); + if (FD_ISSET(fd, &rfds)) { ret = url_read(rtsp_st->rtp_handle, buf, buf_size); if (ret > 0) { *prtsp_st = rtsp_st;