Merge commit '2c17fb61ced2059034856a6c6cd303014aed01fe'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 15:13:24 +0000 (16:13 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 15:13:24 +0000 (16:13 +0100)
* commit '2c17fb61ced2059034856a6c6cd303014aed01fe':
  rtsp: Log getaddrinfo failures

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

Simple merge
Simple merge
Simple merge