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

Ganesh Ajjanagadde gajjanagadde at gmail.com
Thu Aug 13 02:08:40 CEST 2015


On Wed, Aug 12, 2015 at 8:06 PM, Ganesh Ajjanagadde
<gajjanagadde at gmail.com> wrote:
> Fixes Ticket3748
>
> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde at gmail.com>
> ---
>  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
> --
> 2.5.0
>

Please note that I have not tested with older than 3.0.20 version of gnutls,
but have based patch after checking with gnutls NEWS file and ticket desc:
https://trac.ffmpeg.org/ticket/3748.


More information about the ffmpeg-devel mailing list