lavu/hmac: remove deprecated type ids

9 years ago · 137f075993
parent 545559e43d
commit 137f075993
3 changed files with 0 additions and 13 deletions
--- a/libavutil/hmac.c
+++ b/libavutil/hmac.c
@ -81,9 +81,6 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type)
        c->hash     = av_sha_alloc();
        break;
    case AV_HMAC_SHA224:
-#if FF_API_HMAC
-    case AV_HMAC_SHA224_DEPRECATED:
-#endif
        c->blocklen = 64;
        c->hashlen  = 28;
        c->init     = sha224_init;
@ -92,9 +89,6 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type)
        c->hash     = av_sha_alloc();
        break;
    case AV_HMAC_SHA256:
-#if FF_API_HMAC
-    case AV_HMAC_SHA256_DEPRECATED:
-#endif
        c->blocklen = 64;
        c->hashlen  = 32;
        c->init     = sha256_init;
--- a/libavutil/hmac.h
+++ b/libavutil/hmac.h
@ -35,10 +35,6 @@ enum AVHMACType {
    AV_HMAC_SHA1,
    AV_HMAC_SHA224,
    AV_HMAC_SHA256,
-#if FF_API_HMAC
-    AV_HMAC_SHA224_DEPRECATED = 10,
-    AV_HMAC_SHA256_DEPRECATED,
-#endif
    AV_HMAC_SHA384 = 12,
    AV_HMAC_SHA512,
 };
--- a/libavutil/version.h
+++ b/libavutil/version.h
@ -102,9 +102,6 @@
 #ifndef FF_API_DLOG
 #define FF_API_DLOG                     (LIBAVUTIL_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_HMAC
-#define FF_API_HMAC                     (LIBAVUTIL_VERSION_MAJOR < 55)
-#endif
 #ifndef FF_API_CRYPTO_CONTEXT
 #define FF_API_CRYPTO_CONTEXT           (LIBAVUTIL_VERSION_MAJOR < 56)
 #endif