Merge commit '4dbfcd07570a9e45e9597561023adb6da26f27f6'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:20:04 +0000 (13:20 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:20:04 +0000 (13:20 +0200)
* commit '4dbfcd07570a9e45e9597561023adb6da26f27f6':
  librtmp: Avoid an infiniloop setting connection arguments

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

Trivial merge