diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c index 4f7e4dfd6c..0ab104eb8b 100644 --- a/libavutil/blowfish.c +++ b/libavutil/blowfish.c @@ -27,15 +27,6 @@ #include "mem.h" #include "blowfish.h" -#if !FF_API_CRYPTO_CONTEXT -#define AV_BF_ROUNDS 16 - -struct AVBlowfish { - uint32_t p[AV_BF_ROUNDS + 2]; - uint32_t s[4][256]; -}; -#endif - static const uint32_t orig_p[AV_BF_ROUNDS + 2] = { 0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344, 0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89, diff --git a/libavutil/blowfish.h b/libavutil/blowfish.h index d163fd3578..29e2747a14 100644 --- a/libavutil/blowfish.h +++ b/libavutil/blowfish.h @@ -31,16 +31,12 @@ * @{ */ -#if FF_API_CRYPTO_CONTEXT #define AV_BF_ROUNDS 16 typedef struct AVBlowfish { uint32_t p[AV_BF_ROUNDS + 2]; uint32_t s[4][256]; } AVBlowfish; -#else -typedef struct AVBlowfish AVBlowfish; -#endif /** * Allocate an AVBlowfish context. diff --git a/libavutil/des.c b/libavutil/des.c index e7e9178078..c97158a76d 100644 --- a/libavutil/des.c +++ b/libavutil/des.c @@ -25,13 +25,6 @@ #include "mem.h" #include "des.h" -#if !FF_API_CRYPTO_CONTEXT -struct AVDES { - uint64_t round_keys[3][16]; - int triple_des; -}; -#endif - #define T(a, b, c, d, e, f, g, h) 64-a,64-b,64-c,64-d,64-e,64-f,64-g,64-h static const uint8_t IP_shuffle[] = { T(58, 50, 42, 34, 26, 18, 10, 2), diff --git a/libavutil/des.h b/libavutil/des.h index 224745e2f3..4cf11f5bca 100644 --- a/libavutil/des.h +++ b/libavutil/des.h @@ -30,14 +30,10 @@ * @{ */ -#if FF_API_CRYPTO_CONTEXT typedef struct AVDES { uint64_t round_keys[3][16]; int triple_des; } AVDES; -#else -typedef struct AVDES AVDES; -#endif /** * Allocate an AVDES context. diff --git a/libavutil/rc4.c b/libavutil/rc4.c index e507b4a1ab..6bd702c495 100644 --- a/libavutil/rc4.c +++ b/libavutil/rc4.c @@ -25,13 +25,6 @@ #include "mem.h" #include "rc4.h" -#if !FF_API_CRYPTO_CONTEXT -struct AVRC4 { - uint8_t state[256]; - int x, y; -}; -#endif - AVRC4 *av_rc4_alloc(void) { return av_mallocz(sizeof(struct AVRC4)); diff --git a/libavutil/rc4.h b/libavutil/rc4.h index 47c9793df1..ef673b9e08 100644 --- a/libavutil/rc4.h +++ b/libavutil/rc4.h @@ -30,14 +30,10 @@ * @{ */ -#if FF_API_CRYPTO_CONTEXT typedef struct AVRC4 { uint8_t state[256]; int x, y; } AVRC4; -#else -typedef struct AVRC4 AVRC4; -#endif /** * Allocate an AVRC4 context. diff --git a/libavutil/version.h b/libavutil/version.h index 64713d3825..2ad85e3348 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -129,9 +129,6 @@ #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 #ifndef FF_API_VAAPI #define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 56) #endif diff --git a/libavutil/xtea.c b/libavutil/xtea.c index b95f32239e..0d58cba832 100644 --- a/libavutil/xtea.c +++ b/libavutil/xtea.c @@ -34,12 +34,6 @@ #include "mem.h" #include "xtea.h" -#if !FF_API_CRYPTO_CONTEXT -struct AVXTEA { - uint32_t key[16]; -}; -#endif - AVXTEA *av_xtea_alloc(void) { return av_mallocz(sizeof(struct AVXTEA)); diff --git a/libavutil/xtea.h b/libavutil/xtea.h index 4281fd8c8f..9c45c6cb88 100644 --- a/libavutil/xtea.h +++ b/libavutil/xtea.h @@ -33,13 +33,9 @@ * @{ */ -#if FF_API_CRYPTO_CONTEXT typedef struct AVXTEA { uint32_t key[16]; } AVXTEA; -#else -typedef struct AVXTEA AVXTEA; -#endif /** * Allocate an AVXTEA context.