diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 18:01:38 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 18:07:20 +0200 |
| commit | 137f0759933390ecbde2bff0e009deabb4273c72 (patch) | |
| tree | a2144da021098c3100c594520dc082e7e037f43e | |
| parent | 545559e43db5c55924bb9ecedf7465fa58f2f9a6 (diff) | |
| download | ffmpeg-137f0759933390ecbde2bff0e009deabb4273c72.tar.gz | |
lavu/hmac: remove deprecated type ids
| -rw-r--r-- | libavutil/hmac.c | 6 | ||||
| -rw-r--r-- | libavutil/hmac.h | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 0 insertions, 13 deletions
diff --git a/libavutil/hmac.c b/libavutil/hmac.c index 0cf4cd6b25..3e11509a27 100644 --- 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; diff --git a/libavutil/hmac.h b/libavutil/hmac.h index 892c02e5ca..576a0a4fb9 100644 --- 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, }; diff --git a/libavutil/version.h b/libavutil/version.h index 233720f81e..55f442002b 100644 --- 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 |