From bc397246aa0835c1db90abe7c936721e77d004f7 Mon Sep 17 00:00:00 2001 From: James Almer Date: Wed, 29 Jul 2015 21:05:15 -0300 Subject: avutil/hmac: fix API/ABI compatibility with the fork The test code is updated with some cosmetics to avoid the loop using undefined AVHMACType values. The old enum values will be removed in the next major bump, effectively making both projects synced and without API or ABI issues. Reviewed-by: Michael Niedermayer Signed-off-by: James Almer --- libavutil/hmac.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libavutil/hmac.h') diff --git a/libavutil/hmac.h b/libavutil/hmac.h index 4045c08c4f..892c02e5ca 100644 --- a/libavutil/hmac.h +++ b/libavutil/hmac.h @@ -23,7 +23,7 @@ #include -#include "libavutil/avconfig.h" +#include "version.h" /** * @defgroup lavu_hmac HMAC * @ingroup lavu_crypto @@ -33,13 +33,13 @@ enum AVHMACType { AV_HMAC_MD5, AV_HMAC_SHA1, -#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI AV_HMAC_SHA224, -#else - AV_HMAC_SHA224 = 10, -#endif AV_HMAC_SHA256, - AV_HMAC_SHA384, +#if FF_API_HMAC + AV_HMAC_SHA224_DEPRECATED = 10, + AV_HMAC_SHA256_DEPRECATED, +#endif + AV_HMAC_SHA384 = 12, AV_HMAC_SHA512, }; -- cgit v1.2.3