summaryrefslogtreecommitdiffstats
path: root/libavutil/des.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/des.c
parent6d0c8cb79ac0977099e1f6afb28465bd587c5706 (diff)
downloadffmpeg-streaming-3d1690b8c69c5bfad165224393bedd806e30476e.zip
ffmpeg-streaming-3d1690b8c69c5bfad165224393bedd806e30476e.tar.gz
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/des.c')
-rw-r--r--libavutil/des.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/libavutil/des.c b/libavutil/des.c
index e7e9178..c97158a 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),
OpenPOWER on IntegriCloud