[FFmpeg-cvslog] Merge commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 23 19:54:45 2017 -0300| [cd541de9dc27ae9e8a757c6cadfabb1f8c804d6c] | committer: James Almer

Merge commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1'

* commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1':
  rtmpproto: send swfverify value as swfurl if latter is unused

This commit is a noop, see c0b3781bf2fef529d64af0e36ea84c0a34522367

Merged-by: James Almer <jamrial at gmail.com>

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