Mercurial > libavformat.hg

changeset 4641:aa5dcae3f210 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author rbultje
date Tue, 03 Mar 2009 17:06:18 +0000
parents b34d9614b887
children 60d5f0997351
files rtsp.c
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/rtsp.c	Tue Mar 03 17:04:51 2009 +0000
+++ b/rtsp.c	Tue Mar 03 17:06:18 2009 +0000
@@ -1305,7 +1305,7 @@
     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 @@
             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 @@
             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;