History

lavu/hmac: remove deprecated type ids

Hendrik Leppkes committed 11 years ago

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

Unified · Split

3 files
  1. libavutil/hmac.c +0 −6
  2. libavutil/hmac.h +0 −4
  3. libavutil/version.h +0 −3
libavutil/hmac.c+0−6
@@ -81,9 +81,6 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type) · 80 unmodified lines
81 c->hash = av_sha_alloc();81 c->hash = av_sha_alloc();
82 break;82 break;
83 case AV_HMAC_SHA224:83 case AV_HMAC_SHA224:
84#if FF_API_HMAC
85 case AV_HMAC_SHA224_DEPRECATED:
86#endif
87 c->blocklen = 64;84 c->blocklen = 64;
88 c->hashlen = 28;85 c->hashlen = 28;
89 c->init = sha224_init;86 c->init = sha224_init;
@@ -92,9 +89,6 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type) · 2 unmodified lines
92 c->hash = av_sha_alloc();89 c->hash = av_sha_alloc();
93 break;90 break;
94 case AV_HMAC_SHA256:91 case AV_HMAC_SHA256:
95#if FF_API_HMAC
96 case AV_HMAC_SHA256_DEPRECATED:
97#endif
98 c->blocklen = 64;92 c->blocklen = 64;
99 c->hashlen = 32;93 c->hashlen = 32;
100 c->init = sha256_init;94 c->init = sha256_init;
libavutil/hmac.h+0−4
@@ -35,10 +35,6 @@ enum AVHMACType { · 34 unmodified lines
35 AV_HMAC_SHA1,35 AV_HMAC_SHA1,
36 AV_HMAC_SHA224,36 AV_HMAC_SHA224,
37 AV_HMAC_SHA256,37 AV_HMAC_SHA256,
38#if FF_API_HMAC
39 AV_HMAC_SHA224_DEPRECATED = 10,
40 AV_HMAC_SHA256_DEPRECATED,
41#endif
42 AV_HMAC_SHA384 = 12,38 AV_HMAC_SHA384 = 12,
43 AV_HMAC_SHA512,39 AV_HMAC_SHA512,
44};40};
libavutil/version.h+0−3
@@ -102,9 +102,6 @@ · 101 unmodified lines
102#ifndef FF_API_DLOG102#ifndef FF_API_DLOG
103#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)103#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
104#endif104#endif
105#ifndef FF_API_HMAC
106#define FF_API_HMAC (LIBAVUTIL_VERSION_MAJOR < 55)
107#endif
108#ifndef FF_API_CRYPTO_CONTEXT105#ifndef FF_API_CRYPTO_CONTEXT
109#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 56)106#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 56)
110#endif107#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t