summaryrefslogtreecommitdiff
path: root/libavutil/rc4.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/rc4.h
parent6d0c8cb79ac0977099e1f6afb28465bd587c5706 (diff)
downloadffmpeg-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/rc4.h')
-rw-r--r--libavutil/rc4.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavutil/rc4.h b/libavutil/rc4.h
index 47c9793df1..029cd2ad58 100644
--- a/libavutil/rc4.h
+++ b/libavutil/rc4.h
@@ -22,7 +22,6 @@
#define AVUTIL_RC4_H
#include <stdint.h>
-#include "version.h"
/**
* @defgroup lavu_rc4 RC4
@@ -30,14 +29,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.