[FFmpeg-cvslog] attributes: move av_restrict fallback from internal to attributes
Michael Niedermayer
git at videolan.org
Sun Jun 17 18:06:33 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 17 18:01:11 2012 +0200| [5015c37b7d7db1450e47a7f77e060bfc7b216172] | committer: Michael Niedermayer
attributes: move av_restrict fallback from internal to attributes
This should fix --enable-hardcoded-tables
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5015c37b7d7db1450e47a7f77e060bfc7b216172
---
libavutil/attributes.h | 4 ++++
libavutil/internal.h | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index 04d0cdd..75d0cec 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 bfc0f8e..5d37da7 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
More information about the ffmpeg-cvslog
mailing list