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)
commit78af3ffaa934477460522a18d41d29693b6e1d64
treeb62967d50a6773482124310d6bc22b078c0afbcf
parent85c85d453d79a12ff177161c58bb9f2b4da14224
parent1ec611a10228945d2ec8a9cf6c5531dee6b7ee56
Merge commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56'

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

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