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)
commit8dd0e3d50f8488a00fdb59b0794358a0ba334c00
treebb721082b251e72cb263e82c8871e08617d33bdd
parente8487d71be4dfaa3b9be519936ac74917d956d8a
parent4dbfcd07570a9e45e9597561023adb6da26f27f6
Merge commit '4dbfcd07570a9e45e9597561023adb6da26f27f6'

* commit '4dbfcd07570a9e45e9597561023adb6da26f27f6':
  librtmp: Avoid an infiniloop setting connection arguments

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