Merge commit 'd35d0c723e3c8fc8cde76bf677f67928f5e179a8'

[ffmpeg] / libavutil / blowfish.c

diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c
index 4f7e4dfd6cb8b77771b7171290d3ef59b8492ec2..0ab104eb8b44ef8e9d6390ba3b85b358f7caccef 100644 (file)
--- 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,