Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'

[ffmpeg] / libavutil / attributes.h

diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index 159e75d57da949e4bba7af3603b3c775ca6d58bd..8c0e5b2979d959edc6cff747f54b13faa591d5da 100644 (file)
--- a/libavutil/attributes.h
+++ b/libavutil/attributes.h
@@ -52,6 +52,8 @@
 
 #if AV_GCC_VERSION_AT_LEAST(3,1)
 #    define av_noinline __attribute__((noinline))
+#elif defined(_MSC_VER)
+#    define av_noinline __declspec(noinline)
 #else
 #    define av_noinline
 #endif
@@ -62,10 +64,6 @@
 #    define av_pure
 #endif
 
-#ifndef av_restrict
-#define av_restrict restrict
-#endif
-
 #if AV_GCC_VERSION_AT_LEAST(2,6)
 #    define av_const __attribute__((const))
 #else