diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-18 02:55:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-18 02:55:32 +0100 |
| commit | 95d6e5bdd58d5caaa52c57bad1e1d87df59fb7f8 (patch) | |
| tree | 2fc396cb5bebf8ea0f2f46ea55993f902a7ec5b2 /libavformat | |
| parent | 640424e080cbff3733706321d05c32eb7c87b90b (diff) | |
| parent | bb4b0ad83b13c3af57675e80163f3f333adef96f (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp5: Fix illegal read.
vp6: Fix illegal read.
tls: Use TLSv1_client_method for OpenSSL
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/tls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/tls.c b/libavformat/tls.c index 33ee782fa8..72c2b85016 100644 --- a/libavformat/tls.c +++ b/libavformat/tls.c @@ -147,7 +147,7 @@ static int tls_open(URLContext *h, const char *uri, int flags) goto fail; } #elif CONFIG_OPENSSL - c->ctx = SSL_CTX_new(SSLv3_client_method()); + c->ctx = SSL_CTX_new(TLSv1_client_method()); if (!c->ctx) { av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL)); ret = AVERROR(EIO); |