[FFmpeg-cvslog] avformat/tls_gnutls: correct version detection for certificate support

Ganesh Ajjanagadde git at videolan.org
Thu Aug 13 02:34:30 CEST 2015


ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde at gmail.com> | Wed Aug 12 20:06:22 2015 -0400| [1bbb5ea10d9e5e8c0f6e88a11c41659e69409f7d] | committer: Michael Niedermayer

avformat/tls_gnutls: correct version detection for certificate support

Fixes Ticket3748

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/tls_gnutls.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c
index 6388f37..4bf9448 100644
--- a/libavformat/tls_gnutls.c
+++ b/libavformat/tls_gnutls.c
@@ -144,7 +144,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
         if (ret < 0)
             av_log(h, AV_LOG_ERROR, "%s\n", gnutls_strerror(ret));
     }
-#if GNUTLS_VERSION_MAJOR >= 3
+#if GNUTLS_VERSION_NUMBER >= 0x030020
     else
         gnutls_certificate_set_x509_system_trust(p->cred);
 #endif



More information about the ffmpeg-cvslog mailing list