[FFmpeg-cvslog] revert "extern inline" usage

Michael Niedermayer git at videolan.org
Fri Jun 15 10:34:45 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 15 10:29:13 2012 +0200| [cd65cd8c5ab0981c7fc5f51d5d8fddf0eab426a2] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd65cd8c5ab0981c7fc5f51d5d8fddf0eab426a2
---

 libavutil/attributes.h |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index d517fdf..13b6e44 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)



More information about the ffmpeg-cvslog mailing list