Merge commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 12:11:24 +0000 (14:11 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 12:11:24 +0000 (14:11 +0200)
* commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56':
  rtsp: warning when max_delay reached

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

Simple merge