summaryrefslogtreecommitdiff
path: root/libavutil/blowfish.h
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.h
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.h')
-rw-r--r--libavutil/blowfish.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavutil/blowfish.h b/libavutil/blowfish.h
index d163fd3578..9e289a40da 100644
--- a/libavutil/blowfish.h
+++ b/libavutil/blowfish.h
@@ -23,7 +23,6 @@
#define AVUTIL_BLOWFISH_H
#include <stdint.h>
-#include "version.h"
/**
* @defgroup lavu_blowfish Blowfish
@@ -31,16 +30,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.