RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavu/hmac: remove deprecated type ids

This commit is contained in:
Hendrik Leppkes 2015-09-05 18:01:38 +02:00
parent 545559e43d
commit 137f075993
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/hmac.c
View File

@ -81,9 +81,6 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type)
c->hash = av_sha_alloc(); c->hash = av_sha_alloc();
break; break;
case AV_HMAC_SHA224: case AV_HMAC_SHA224:
#if FF_API_HMAC
case AV_HMAC_SHA224_DEPRECATED:
#endif
c->blocklen = 64; c->blocklen = 64;
c->hashlen = 28; c->hashlen = 28;
c->init = sha224_init; c->init = sha224_init;
@ -92,9 +89,6 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type)
c->hash = av_sha_alloc(); c->hash = av_sha_alloc();
break; break;
case AV_HMAC_SHA256: case AV_HMAC_SHA256:
#if FF_API_HMAC
case AV_HMAC_SHA256_DEPRECATED:
#endif
c->blocklen = 64; c->blocklen = 64;
c->hashlen = 32; c->hashlen = 32;
c->init = sha256_init; c->init = sha256_init;

4
libavutil/hmac.h
View File

@ -35,10 +35,6 @@ enum AVHMACType {
AV_HMAC_SHA1, AV_HMAC_SHA1,
AV_HMAC_SHA224, AV_HMAC_SHA224,
AV_HMAC_SHA256, AV_HMAC_SHA256,
#if FF_API_HMAC
AV_HMAC_SHA224_DEPRECATED = 10,
AV_HMAC_SHA256_DEPRECATED,
#endif
AV_HMAC_SHA384 = 12, AV_HMAC_SHA384 = 12,
AV_HMAC_SHA512, AV_HMAC_SHA512,
}; };

3
libavutil/version.h
View File

@ -102,9 +102,6 @@
#ifndef FF_API_DLOG #ifndef FF_API_DLOG
#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56) #define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_HMAC
#define FF_API_HMAC (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
#ifndef FF_API_CRYPTO_CONTEXT #ifndef FF_API_CRYPTO_CONTEXT
#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 56) #define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 56)
#endif #endif