[FFmpeg-cvslog] Merge commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct  3 21:37:37 2017 -0300| [7c74efeaf89111d686f928cbf1fe20d9a768d31f] | committer: James Almer

Merge commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86'

* commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86':
  rtsp: Move the pollfd setup out of the for loop

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c74efeaf89111d686f928cbf1fe20d9a768d31f
---

 libavformat/rtsp.c | 56 +++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 736559eab3..7407014f5e 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1931,39 +1931,39 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
     struct pollfd *p = rt->p;
     int *fds = NULL, fdsnum, fdsidx;
 
+    if (rt->rtsp_hd) {
+        tcp_fd = ffurl_get_file_handle(rt->rtsp_hd);
+        p[max_p].fd = tcp_fd;
+        p[max_p++].events = POLLIN;
+    } else {
+        tcp_fd = -1;
+    }
+    for (i = 0; i < rt->nb_rtsp_streams; i++) {
+        rtsp_st = rt->rtsp_streams[i];
+        if (rtsp_st->rtp_handle) {
+            if (ret = ffurl_get_multi_file_handle(rtsp_st->rtp_handle,
+                                                  &fds, &fdsnum)) {
+                av_log(s, AV_LOG_ERROR, "Unable to recover rtp ports\n");
+                return ret;
+            }
+            if (fdsnum != 2) {
+                av_log(s, AV_LOG_ERROR,
+                       "Number of fds %d not supported\n", fdsnum);
+                return AVERROR_INVALIDDATA;
+            }
+            for (fdsidx = 0; fdsidx < fdsnum; fdsidx++) {
+                p[max_p].fd       = fds[fdsidx];
+                p[max_p++].events = POLLIN;
+            }
+            av_freep(&fds);
+        }
+    }
+
     for (;;) {
         if (ff_check_interrupt(&s->interrupt_callback))
             return AVERROR_EXIT;
         if (wait_end && wait_end - av_gettime_relative() < 0)
             return AVERROR(EAGAIN);
-        max_p = 0;
-        if (rt->rtsp_hd) {
-            tcp_fd = ffurl_get_file_handle(rt->rtsp_hd);
-            p[max_p].fd = tcp_fd;
-            p[max_p++].events = POLLIN;
-        } else {
-            tcp_fd = -1;
-        }
-        for (i = 0; i < rt->nb_rtsp_streams; i++) {
-            rtsp_st = rt->rtsp_streams[i];
-            if (rtsp_st->rtp_handle) {
-                if (ret = ffurl_get_multi_file_handle(rtsp_st->rtp_handle,
-                                                      &fds, &fdsnum)) {
-                    av_log(s, AV_LOG_ERROR, "Unable to recover rtp ports\n");
-                    return ret;
-                }
-                if (fdsnum != 2) {
-                    av_log(s, AV_LOG_ERROR,
-                           "Number of fds %d not supported\n", fdsnum);
-                    return AVERROR_INVALIDDATA;
-                }
-                for (fdsidx = 0; fdsidx < fdsnum; fdsidx++) {
-                    p[max_p].fd       = fds[fdsidx];
-                    p[max_p++].events = POLLIN;
-                }
-                av_freep(&fds);
-            }
-        }
         n = poll(p, max_p, POLL_TIMEOUT_MS);
         if (n > 0) {
             int j = 1 - (tcp_fd == -1);


======================================================================

diff --cc libavformat/rtsp.c
index 736559eab3,e4cbae43a2..7407014f5e
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@@ -1931,6 -1920,34 +1931,34 @@@ static int udp_read_packet(AVFormatCont
      struct pollfd *p = rt->p;
      int *fds = NULL, fdsnum, fdsidx;
  
+     if (rt->rtsp_hd) {
+         tcp_fd = ffurl_get_file_handle(rt->rtsp_hd);
+         p[max_p].fd = tcp_fd;
+         p[max_p++].events = POLLIN;
+     } else {
+         tcp_fd = -1;
+     }
+     for (i = 0; i < rt->nb_rtsp_streams; i++) {
+         rtsp_st = rt->rtsp_streams[i];
+         if (rtsp_st->rtp_handle) {
+             if (ret = ffurl_get_multi_file_handle(rtsp_st->rtp_handle,
+                                                   &fds, &fdsnum)) {
+                 av_log(s, AV_LOG_ERROR, "Unable to recover rtp ports\n");
+                 return ret;
+             }
+             if (fdsnum != 2) {
+                 av_log(s, AV_LOG_ERROR,
+                        "Number of fds %d not supported\n", fdsnum);
+                 return AVERROR_INVALIDDATA;
+             }
+             for (fdsidx = 0; fdsidx < fdsnum; fdsidx++) {
+                 p[max_p].fd       = fds[fdsidx];
+                 p[max_p++].events = POLLIN;
+             }
 -            av_free(fds);
++            av_freep(&fds);
+         }
+     }
+ 
      for (;;) {
          if (ff_check_interrupt(&s->interrupt_callback))
              return AVERROR_EXIT;