Merge commit '11f87ca71e9c7b917f594194f827fd040d1df5ca'

[ffmpeg] / libavutil / xtea.h

diff --git a/libavutil/xtea.h b/libavutil/xtea.h
index 4281fd8c8f2ba31685917e503d98f32690e65302..bcf786cce3027168b3809da4f069132eab8c3bca 100644 (file)
--- a/libavutil/xtea.h
+++ b/libavutil/xtea.h
@@ -23,7 +23,6 @@
 #define AVUTIL_XTEA_H
 
 #include <stdint.h>
-#include "version.h"
 
 /**
  * @file
@@ -33,13 +32,9 @@
  * @{
  */
 
-#if FF_API_CRYPTO_CONTEXT
 typedef struct AVXTEA {
     uint32_t key[16];
 } AVXTEA;
-#else
-typedef struct AVXTEA AVXTEA;
-#endif
 
 /**
  * Allocate an AVXTEA context.