Merge commit '563e6d860391bac0511984e5c0842320b5c94d2d'

[ffmpeg] / libavutil / rc4.h

diff --git a/libavutil/rc4.h b/libavutil/rc4.h
index 47c9793df14cb5c43d5b024f6d3aab46e74cb94f..029cd2ad58b9dd3850c22703a60f73d6486da888 100644 (file)
--- 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.