From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 15 Jun 2012 08:29:13 +0000 (+0200)
Subject: revert "extern inline" usage
X-Git-Tag: android-x86-4.4-r1~11232
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cd65cd8c5ab0981c7fc5f51d5d8fddf0eab426a2;p=android-x86%2Fexternal-ffmpeg.git

revert "extern inline" usage

as it breaks ICC:
libavcodec/libavcodec.a(snowenc.o): In function `encode_q_branch':
/home/fate/x86_64-linux-gnu-icc-2011.4.191/src/libavcodec/snowenc.c:405: undefined reference to `ff_epzs_motion_search'
/home/fate/x86_64-linux-gnu-icc-2011.4.191/src/libavcodec/snowenc.c:414: undefined reference to `ff_get_mb_score'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index d517fdf49d..13b6e44b89 100644
--- a/libavutil/attributes.h
+++ b/libavutil/attributes.h
@@ -41,12 +41,8 @@
 #endif
 
 #ifndef av_extern_inline
-#if defined(__INTEL_COMPILER) ||  defined(__GNUC_STDC_INLINE__)
-#    define av_extern_inline extern inline
-#else
 #    define av_extern_inline inline
 #endif
-#endif
 
 #ifndef av_noreturn
 #if AV_GCC_VERSION_AT_LEAST(2,5)