simplify round_key generation by writing over the end but ensuring that theres some...

[ffmpeg] / libavutil / common.h

diff --git a/libavutil/common.h b/libavutil/common.h
index d8baf12379b013b97d9d14b0fcafc3e6955b84e9..4ca5353f5fa7a6bf3a54352e905d44c780ff25c7 100644 (file)
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -43,6 +43,17 @@
 #        include "berrno.h"
 #    endif
 #    include <math.h>
+#endif /* HAVE_AV_CONFIG_H */
+
+#ifndef av_always_inline
+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
+#    define av_always_inline __attribute__((always_inline)) inline
+#else
+#    define av_always_inline inline
+#endif
+#endif
+
+#ifdef HAVE_AV_CONFIG_H
 #    include "internal.h"
 #endif /* HAVE_AV_CONFIG_H */
 
@@ -109,7 +120,7 @@ static inline int av_log2_16bit(unsigned int v)
 /* median of 3 */
 static inline int mid_pred(int a, int b, int c)
 {
-#if HAVE_CMOV
+#ifdef HAVE_CMOV
     int i=b;
     asm volatile(
         "cmp    %2, %1 \n\t"