Merge commit '98063bcf15eb1e9bf9c8758c83c88d51cbb7ace7'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 15:09:58 +0000 (16:09 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 15:09:58 +0000 (16:09 +0100)
* commit '98063bcf15eb1e9bf9c8758c83c88d51cbb7ace7':
  rtsp: Do not assume getnameinfo cannot fail

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavformat/rtsp.c

Simple merge