lavu/hmac: remove deprecated type ids

Hendrik Leppkes committed 11 years ago

Commit 137f0751 parent 545559e3 files · +0 −13Browse files

Unified · Split

3 files

@@ -81,9 +81,6 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type) · 80 unmodified lines
81	81	c->hash = av_sha_alloc();
82	82	break;
83	83	case AV_HMAC_SHA224:
84		−#if FF_API_HMAC
85		− case AV_HMAC_SHA224_DEPRECATED:
86		−#endif
87	84	c->blocklen = 64;
88	85	c->hashlen = 28;
89	86	c->init = sha224_init;
@@ -92,9 +89,6 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type) · 2 unmodified lines
92	89	c->hash = av_sha_alloc();
93	90	break;
94	91	case AV_HMAC_SHA256:
95		−#if FF_API_HMAC
96		− case AV_HMAC_SHA256_DEPRECATED:
97		−#endif
98	92	c->blocklen = 64;
99	93	c->hashlen = 32;
100	94	c->init = sha256_init;

@@ -35,10 +35,6 @@ enum AVHMACType { · 34 unmodified lines
35	35	AV_HMAC_SHA1,
36	36	AV_HMAC_SHA224,
37	37	AV_HMAC_SHA256,
38		−#if FF_API_HMAC
39		− AV_HMAC_SHA224_DEPRECATED = 10,
40		− AV_HMAC_SHA256_DEPRECATED,
41		−#endif
42	38	AV_HMAC_SHA384 = 12,
43	39	AV_HMAC_SHA512,
44	40	};

@@ -102,9 +102,6 @@ · 101 unmodified lines
102	102	#ifndef FF_API_DLOG
103	103	#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
104	104	#endif
105		−#ifndef FF_API_HMAC
106		−#define FF_API_HMAC (LIBAVUTIL_VERSION_MAJOR < 55)
107		−#endif
108	105	#ifndef FF_API_CRYPTO_CONTEXT
109	106	#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 56)
110	107	#endif

Keyboard shortcuts