[FFmpeg-cvslog] Merge commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Sep 16 14:11:24 2015 +0200| [78af3ffaa934477460522a18d41d29693b6e1d64] | committer: Hendrik Leppkes

Merge commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56'

* commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56':
  rtsp: warning when max_delay reached

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78af3ffaa934477460522a18d41d29693b6e1d64
---