Merge commit 'f25117a4286505b38c12466ef04459471de3c1b0'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:21:35 +0000 (19:21 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:21:35 +0000 (19:21 -0300)
commit768b07e3bca7e81d2f9c60badb3973d3d88481dc
treeb2890236ee6012b7926afcbf85df04ef49db33fe
parent2d62e06ff6a9f3dbd78136c1dc4a315a727c6f00
parentf25117a4286505b38c12466ef04459471de3c1b0
Merge commit 'f25117a4286505b38c12466ef04459471de3c1b0'

* commit 'f25117a4286505b38c12466ef04459471de3c1b0':
  libsrt: Pass the correct pointer for the passphrase

Merged-by: James Almer <jamrial@gmail.com>
libavformat/libsrt.c