[FFmpeg-cvslog] lavu/hmac: remove deprecated type ids
Hendrik Leppkes
git at videolan.org
Sat Sep 5 18:07:59 CEST 2015
ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Sep 5 18:01:38 2015 +0200| [137f0759933390ecbde2bff0e009deabb4273c72] | committer: Hendrik Leppkes
lavu/hmac: remove deprecated type ids
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=137f0759933390ecbde2bff0e009deabb4273c72
---
libavutil/hmac.c | 6 ------
libavutil/hmac.h | 4 ----
libavutil/version.h | 3 ---
3 files changed, 13 deletions(-)
diff --git a/libavutil/hmac.c b/libavutil/hmac.c
index 0cf4cd6..3e11509 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 892c02e..576a0a4 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 233720f..55f4420 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
More information about the ffmpeg-cvslog
mailing list