diff options
| author | James Almer <jamrial@gmail.com> | 2015-07-29 21:05:15 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-07-29 21:32:05 -0300 |
| commit | bc397246aa0835c1db90abe7c936721e77d004f7 (patch) | |
| tree | 000bdebdf17df5ea22959e46108f15dd873b1145 /libavutil/hmac.h | |
| parent | 15a7a3cf0aaacc264593453f0e2fbedba7b26654 (diff) | |
| download | ffmpeg-bc397246aa0835c1db90abe7c936721e77d004f7.tar.gz | |
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 <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/hmac.h')
| -rw-r--r-- | libavutil/hmac.h | 12 |
1 files changed, 6 insertions, 6 deletions
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 <stdint.h> -#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, }; |