]> git.sesse.net Git - ffmpeg/commit
Merge commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 22:54:45 +0000 (19:54 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 22:54:45 +0000 (19:54 -0300)
commitcd541de9dc27ae9e8a757c6cadfabb1f8c804d6c
tree3f420e60ecd7e2f5c0a87a461e67f3c2a37f0853
parent4e6c85b3bae08aa2212d93d0f7986512226fb9c7
parentd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1
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@gmail.com>