Read & write initial_states for ffv1

[ffmpeg] / libavutil / intmath.h

diff --git a/libavutil/intmath.h b/libavutil/intmath.h
index 02870cb282cb608c2e642f683612aa8f7d7b5727..8b400ef05464c92bdb345d3dcccd3f15cd65b104 100644 (file)
--- a/libavutil/intmath.h
+++ b/libavutil/intmath.h
@@ -21,8 +21,9 @@
 #ifndef AVUTIL_INTMATH_H
 #define AVUTIL_INTMATH_H
 
+#include <stdint.h>
 #include "config.h"
-#include "common.h"
+#include "attributes.h"
 
 extern const uint32_t ff_inverse[257];
 
@@ -35,27 +36,24 @@ extern const uint32_t ff_inverse[257];
 #if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
 
 #ifndef av_log2
-
-#define av_log2(x) (31 - __builtin_clz((x)|1))
-
-#ifndef av_log2_16bit
-#define av_log2_16bit av_log2
-#endif
-
+#   define av_log2(x) (31 - __builtin_clz((x)|1))
+#   ifndef av_log2_16bit
+#      define av_log2_16bit av_log2
+#   endif
 #endif /* av_log2 */
 
 #endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
 
 #ifndef FASTDIV
-
-#if CONFIG_FASTDIV
-#    define FASTDIV(a,b)   ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32))
-#else
-#    define FASTDIV(a,b)   ((a) / (b))
-#endif
-
+#   if CONFIG_FASTDIV
+#       define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32))
+#   else
+#       define FASTDIV(a,b) ((a) / (b))
+#   endif
 #endif /* FASTDIV */
 
+#include "common.h"
+
 extern const uint8_t ff_sqrt_tab[256];
 
 static inline av_const unsigned int ff_sqrt(unsigned int a)