Merge commit '5263f464db5f2df74ddf712f6d1221b24475fa8e'

* commit '5263f464db5f2df74ddf712f6d1221b24475fa8e':
  rtsp: Lazily allocate the pollfd array

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

diff --cc libavformat/rtsp.c
index 7407014,4ff12c6..2d1df80
--- 1/libavformat/rtsp.c
--- 2/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@@ -711,14 -702,12 +710,12 @@@ int ff_sdp_parse(AVFormatContext *s, co
      }
  
      for (i = 0; i < s1->nb_default_include_source_addrs; i++)
 -        av_free(s1->default_include_source_addrs[i]);
 +        av_freep(&s1->default_include_source_addrs[i]);
      av_freep(&s1->default_include_source_addrs);
      for (i = 0; i < s1->nb_default_exclude_source_addrs; i++)
 -        av_free(s1->default_exclude_source_addrs[i]);
 +        av_freep(&s1->default_exclude_source_addrs[i]);
      av_freep(&s1->default_exclude_source_addrs);
  
-     rt->p = av_malloc_array(rt->nb_rtsp_streams + 1, sizeof(struct pollfd) * 2);
-     if (!rt->p) return AVERROR(ENOMEM);
      return 0;
  }
  #endif /* CONFIG_RTPDEC */