Merge commit '11f87ca71e9c7b917f594194f827fd040d1df5ca'

[ffmpeg] / libavutil / des.h

diff --git a/libavutil/des.h b/libavutil/des.h
index 32f3a80fabd74cadae5be1bad1c88d4fb6a2346a..4cf11f5bca47a18544e172bc1d4457a3ff7a1720 100644 (file)
--- a/libavutil/des.h
+++ b/libavutil/des.h
@@ -23,7 +23,6 @@
 #define AVUTIL_DES_H
 
 #include <stdint.h>
-#include "version.h"
 
 /**
  * @defgroup lavu_des DES
@@ -31,14 +30,10 @@
  * @{
  */
 
-#if FF_API_CRYPTO_CONTEXT
 typedef struct AVDES {
     uint64_t round_keys[3][16];
     int triple_des;
 } AVDES;
-#else
-typedef struct AVDES AVDES;
-#endif
 
 /**
  * Allocate an AVDES context.