[FFmpeg-cvslog] lavf/tls_gnutls: fix compilation with GnuTLS 2.x

Moritz Barsnick git at videolan.org
Tue Sep 26 16:06:56 EEST 2017


ffmpeg | branch: master | Moritz Barsnick <barsnick at gmx.net> | Tue Sep 26 13:25:53 2017 +0200| [16c8a9feeab36239bb7cf5f87fa8cad4dc50ae8c] | committer: Carl Eugen Hoyos

lavf/tls_gnutls: fix compilation with GnuTLS 2.x

Commit 598e41684066feba701d19ca7443d24b9e5efa77 added use of
GNUTLS_E_PREMATURE_TERMINATION, which wasn't introduced to GnuTLS
before 2.99.x / 3.x. This fixes compilation with older versions.

Signed-off-by: Moritz Barsnick <barsnick at gmx.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16c8a9feeab36239bb7cf5f87fa8cad4dc50ae8c
---

 libavformat/tls_gnutls.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c
index 38f8ea4804..7174dfd3fc 100644
--- a/libavformat/tls_gnutls.c
+++ b/libavformat/tls_gnutls.c
@@ -72,7 +72,9 @@ static int print_tls_error(URLContext *h, int ret)
     switch (ret) {
     case GNUTLS_E_AGAIN:
     case GNUTLS_E_INTERRUPTED:
+#ifdef GNUTLS_E_PREMATURE_TERMINATION
     case GNUTLS_E_PREMATURE_TERMINATION:
+#endif
         break;
     case GNUTLS_E_WARNING_ALERT_RECEIVED:
         av_log(h, AV_LOG_WARNING, "%s\n", gnutls_strerror(ret));



More information about the ffmpeg-cvslog mailing list