summaryrefslogtreecommitdiff
path: root/libavutil/blowfish.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2015-10-16 03:04:20 -0300
committerJames Almer <jamrial@gmail.com>2015-10-16 19:13:38 -0300
commit3d1690b8c69c5bfad165224393bedd806e30476e (patch)
treed524ead8e39a2d04e43b0b2ae9230ca024ee2fab /libavutil/blowfish.c
parent6d0c8cb79ac0977099e1f6afb28465bd587c5706 (diff)
avutil: undo FF_API_CRYPTO_CONTEXT deprecation
It's been argued that the benefits of the current implementation far outweight those of making the structs opaque. This deprecation is not present in any release, so it can be safely removed. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/blowfish.c')
-rw-r--r--libavutil/blowfish.c9
1 files changed, 0 insertions, 9 deletions
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,