aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-17 18:01:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-17 18:05:31 +0200
commit5015c37b7d7db1450e47a7f77e060bfc7b216172 (patch)
tree246cd60f871c5562c92cd62c1883cdb7d0dcdaaa
parent40ffbf20d848d76eae5b8f1bec94bc46dc369fb5 (diff)
downloadffmpeg-5015c37b7d7db1450e47a7f77e060bfc7b216172.tar.gz
attributes: move av_restrict fallback from internal to attributes
This should fix --enable-hardcoded-tables Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/attributes.h4
-rw-r--r--libavutil/internal.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index 04d0cddc48..75d0cec8f1 100644
--- a/libavutil/attributes.h
+++ b/libavutil/attributes.h
@@ -72,6 +72,10 @@
#endif
#endif
+#ifndef av_restrict
+#define av_restrict restrict
+#endif
+
#ifndef av_const
#if AV_GCC_VERSION_AT_LEAST(2,6)
# define av_const __attribute__((const))
diff --git a/libavutil/internal.h b/libavutil/internal.h
index bfc0f8e519..5d37da7b45 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -53,10 +53,6 @@ struct AVDictionary {
#endif
#endif
-#ifndef av_restrict
-#define av_restrict restrict
-#endif
-
#ifndef INT16_MIN
#define INT16_MIN (-0x7fff - 1)
#endif