From f4ae934a3b08762a33a325db4d40fccb06a5d11f Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Mon, 26 Apr 2004 09:43:55 +0000
Subject: [PATCH] avoid macro conflicts

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

diff --git a/libavcodec/common.h b/libavcodec/common.h
index 203579ac5e..b0a3db526d 100644
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -76,17 +76,21 @@ extern const struct AVOption avoptions_workaround_bug[11];
 #    define restrict
 #endif
 
+#ifndef always_inline
 #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
 #    define always_inline __attribute__((always_inline)) inline
 #else
 #    define always_inline inline
 #endif
+#endif
 
+#ifndef attribute_used
 #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
 #    define attribute_used __attribute__((used))
 #else
 #    define attribute_used
 #endif
+#endif
 
 #ifndef EMULATE_INTTYPES
 #   include <inttypes.h>