From 75af07495adce80b64e8240b6d6efc61ea14265b Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 30 Jul 2009 21:58:43 +0000
Subject: Revert addition of '#undef av_always_inline' to config.h in the small
 case. Instead, #include config.h at the top of common.h so that
 av_always_inline does not get doubly defined.

Originally committed as revision 19553 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavutil/common.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libavutil/common.h')

diff --git a/libavutil/common.h b/libavutil/common.h
index 5f47572..47666ab 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -35,6 +35,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_AV_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef __GNUC__
 #    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
 #else
@@ -280,7 +284,6 @@ static inline av_const float av_clipf(float a, float amin, float amax)
 #include "mem.h"
 
 #ifdef HAVE_AV_CONFIG_H
-#    include "config.h"
 #    include "internal.h"
 #endif /* HAVE_AV_CONFIG_H */
 
-- 
cgit v1.1