diff options
| author | Moritz Barsnick <barsnick@gmx.net> | 2017-09-26 13:25:54 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-09-26 15:05:32 +0200 |
| commit | 6bf48c4805cbb9754aa5a7bcb5f46df6bda95447 (patch) | |
| tree | c2701ec7101d8d281a41a2029dade6c8d174e43f /libavformat | |
| parent | 16c8a9feeab36239bb7cf5f87fa8cad4dc50ae8c (diff) | |
| download | ffmpeg-streaming-6bf48c4805cbb9754aa5a7bcb5f46df6bda95447.zip ffmpeg-streaming-6bf48c4805cbb9754aa5a7bcb5f46df6bda95447.tar.gz | |
lavf/tls_gnutls: fix warnings from version check
The GnuTLS version is checked through the macro GNUTLS_VERSION_NUMBER,
but this wasn't introduced before 2.7.2. Building with older versions
of GnuTLS (using icc) warns:
src/libavformat/tls_gnutls.c(38): warning #193: zero used for undefined preprocessing identifier "GNUTLS_VERSION_NUMBER"
#if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
This adds a fallback to the older, deprecated LIBGNUTLS_VERSION_NUMBER
macro.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/tls_gnutls.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index 7174dfd..5ce6c3d 100644 --- a/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c @@ -35,6 +35,10 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" +#ifndef GNUTLS_VERSION_NUMBER +#define GNUTLS_VERSION_NUMBER LIBGNUTLS_VERSION_NUMBER +#endif + #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00 #include <gcrypt.h> #include "libavutil/thread.h" |
