diff options
author | James Almer | 2018-09-02 19:21:35 -0300 |
---|---|---|
committer | James Almer | 2018-09-02 19:21:35 -0300 |
commit | 768b07e3bca7e81d2f9c60badb3973d3d88481dc (patch) | |
tree | b2890236ee6012b7926afcbf85df04ef49db33fe | |
parent | 2d62e06ff6a9f3dbd78136c1dc4a315a727c6f00 (diff) | |
parent | f25117a4286505b38c12466ef04459471de3c1b0 (diff) |
Merge commit 'f25117a4286505b38c12466ef04459471de3c1b0'
* commit 'f25117a4286505b38c12466ef04459471de3c1b0':
libsrt: Pass the correct pointer for the passphrase
Merged-by: James Almer <jamrial@gmail.com>
-rw-r--r-- | libavformat/libsrt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index c19d85192f..9795e279e8 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -299,7 +299,7 @@ static int libsrt_set_options_pre(URLContext *h, int fd) if ((s->mode == SRT_MODE_RENDEZVOUS && libsrt_setsockopt(h, fd, SRTO_RENDEZVOUS, "SRTO_RENDEZVOUS", &yes, sizeof(yes)) < 0) || (s->maxbw >= 0 && libsrt_setsockopt(h, fd, SRTO_MAXBW, "SRTO_MAXBW", &s->maxbw, sizeof(s->maxbw)) < 0) || (s->pbkeylen >= 0 && libsrt_setsockopt(h, fd, SRTO_PBKEYLEN, "SRTO_PBKEYLEN", &s->pbkeylen, sizeof(s->pbkeylen)) < 0) || - (s->passphrase && libsrt_setsockopt(h, fd, SRTO_PASSPHRASE, "SRTO_PASSPHRASE", &s->passphrase, sizeof(s->passphrase)) < 0) || + (s->passphrase && libsrt_setsockopt(h, fd, SRTO_PASSPHRASE, "SRTO_PASSPHRASE", s->passphrase, strlen(s->passphrase)) < 0) || (s->mss >= 0 && libsrt_setsockopt(h, fd, SRTO_MSS, "SRTO_MMS", &s->mss, sizeof(s->mss)) < 0) || (s->ffs >= 0 && libsrt_setsockopt(h, fd, SRTO_FC, "SRTO_FC", &s->ffs, sizeof(s->ffs)) < 0) || (s->ipttl >= 0 && libsrt_setsockopt(h, fd, SRTO_IPTTL, "SRTO_UPTTL", &s->ipttl, sizeof(s->ipttl)) < 0) || |