diff --git a/configure.ac b/configure.ac index 2cc0525e7..84080b4fc 100644 --- a/configure.ac +++ b/configure.ac @@ -972,6 +972,7 @@ AC_ARG_ENABLE([mcast], # web server (--enable-webserver) HAVE_WEBSERVER # net-snmp (--enable-net-snmp) # krb (--enable-krb) WOLFSSL_KRB +# FFmpeg (--enable-ffmpeg) WOLFSSL_FFMPEG # Bind DNS compatibility Build @@ -1114,6 +1115,13 @@ AC_ARG_ENABLE([krb], [ ENABLED_KRB=no ] ) +# FFmpeg Build +AC_ARG_ENABLE([ffmpeg], + [AS_HELP_STRING([--enable-ffmpeg],[Enable FFmpeg support (default: disabled)])], + [ ENABLED_FFMPEG=$enableval ], + [ ENABLED_FFMPEG=no ] + ) + #IP alternative name Support AC_ARG_ENABLE([ip-alt-name], @@ -1263,7 +1271,8 @@ if test "$ENABLED_LIBWEBSOCKETS" = "yes" || test "$ENABLED_OPENVPN" = "yes" || \ test "$ENABLED_HAPROXY" = "yes" || test "$ENABLED_BIND" = "yes" || \ test "$ENABLED_NTP" = "yes" || test "$ENABLED_NETSNMP" = "yes" || \ test "$ENABLED_OPENRESTY" = "yes" || test "$ENABLED_RSYSLOG" = "yes" || \ - test "$ENABLED_KRB" = "yes" || test "$ENABLED_CHRONY" = "yes" + test "$ENABLED_KRB" = "yes" || test "$ENABLED_CHRONY" = "yes" || \ + test "$ENABLED_FFMPEG" = "yes" then ENABLED_OPENSSLALL="yes" fi @@ -4958,6 +4967,11 @@ then fi fi +if test "$ENABLED_FFMPEG" = "yes" +then + AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_FFMPEG -DOPENSSL_COMPATIBLE_DEFAULTS" +fi + if test "$ENABLED_SIGNAL" = "yes" then AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SIGNAL -DWOLFSSL_AES_COUNTER -DWOLFSSL_AES_DIRECT" diff --git a/wolfssl/openssl/opensslv.h b/wolfssl/openssl/opensslv.h index 9ab5ffebd..2826aba4a 100644 --- a/wolfssl/openssl/opensslv.h +++ b/wolfssl/openssl/opensslv.h @@ -40,7 +40,7 @@ #elif defined(WOLFSSL_QT) || defined(WOLFSSL_PYTHON) /* For Qt and Python 3.8.5 compatibility */ #define OPENSSL_VERSION_NUMBER 0x10101000L -#elif defined(WOLFSSL_HAPROXY) +#elif defined(WOLFSSL_HAPROXY) || defined(WOLFSSL_FFMPEG) #define OPENSSL_VERSION_NUMBER 0x1010000fL #elif defined(OPENSSL_ALL) || defined(HAVE_LIGHTY) || \ defined(WOLFSSL_NGINX) || defined(WOLFSSL_OPENSSH) || defined(WOLFSSL_OPENVPN)