Merge commit '5263f464db5f2df74ddf712f6d1221b24475fa8e'
authorJames Almer <jamrial@gmail.com>
Wed, 4 Oct 2017 00:40:22 +0000 (21:40 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 4 Oct 2017 00:40:22 +0000 (21:40 -0300)
commitc2916564d8e469e74074b3c8af325af8ac334a63
tree7c5073cfde929f221dc4e5a9817e31130f8ddbd0
parent7c74efeaf89111d686f928cbf1fe20d9a768d31f
parent5263f464db5f2df74ddf712f6d1221b24475fa8e
Merge commit '5263f464db5f2df74ddf712f6d1221b24475fa8e'

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

Merged-by: James Almer <jamrial@gmail.com>
libavformat/rtsp.c