aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2016-10-25 21:33:34 +0300
committerMartin Storsjö <martin@martin.st>2016-10-25 21:48:35 +0300
commitf22363c72968f1a1fc4881d8695ec7068b0aa03c (patch)
tree481b62523ac1f59df63462b3d91fbb29eddbc83f /libavformat
parent052b97855de2396e46682bcbae97f95a258816d4 (diff)
downloadffmpeg-f22363c72968f1a1fc4881d8695ec7068b0aa03c.tar.gz
openssl: Avoid double semicolons after the GET_BIO_DATA macro
When the macro is expanded with a semicolon following it and the macro itself contains a semicolon, we ended up in double semicolons, which is treated as a statement that disallows further declarations. This avoids errors about mixed declarations and statements on gcc, after ee050797664c. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/tls_openssl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
index 4d94774355..aab885c8d3 100644
--- a/libavformat/tls_openssl.c
+++ b/libavformat/tls_openssl.c
@@ -152,9 +152,9 @@ static int url_bio_destroy(BIO *b)
}
#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
-#define GET_BIO_DATA(x) BIO_get_data(x);
+#define GET_BIO_DATA(x) BIO_get_data(x)
#else
-#define GET_BIO_DATA(x) (x)->ptr;
+#define GET_BIO_DATA(x) (x)->ptr
#endif
static int url_bio_bread(BIO *b, char *buf, int len)