diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-22 01:02:36 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-09-22 16:10:21 +0300 |
| commit | 5055035670bd1a1eaca64bd3bc71fb07de9df2c3 (patch) | |
| tree | c732bbb73ea3847f5cf5c95434347ca4d1bfa7f9 /libavformat | |
| parent | c951e4b442df9dde6051634a85359eb809bf2142 (diff) | |
| download | ffmpeg-5055035670bd1a1eaca64bd3bc71fb07de9df2c3.tar.gz | |
tls: Do not abort on non-fatal TLS alerts with gnutls
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/tls.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/tls.c b/libavformat/tls.c index fecf096b02..7fa6fc2cae 100644 --- a/libavformat/tls.c +++ b/libavformat/tls.c @@ -72,7 +72,14 @@ static int do_tls_poll(URLContext *h, int ret) TLSContext *c = h->priv_data; struct pollfd p = { c->fd, 0, 0 }; #if CONFIG_GNUTLS - if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) { + switch (ret) { + case GNUTLS_E_AGAIN: + case GNUTLS_E_INTERRUPTED: + break; + case GNUTLS_E_WARNING_ALERT_RECEIVED: + av_log(h, AV_LOG_WARNING, "%s\n", gnutls_strerror(ret)); + break; + default: av_log(h, AV_LOG_ERROR, "%s\n", gnutls_strerror(ret)); return AVERROR(EIO); } |