[FFmpeg-cvslog] Merge commit '4dbfcd07570a9e45e9597561023adb6da26f27f6'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Oct  7 13:20:04 2016 +0200| [8dd0e3d50f8488a00fdb59b0794358a0ba334c00] | committer: Hendrik Leppkes

Merge commit '4dbfcd07570a9e45e9597561023adb6da26f27f6'

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

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

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