[FFmpeg-cvslog] avutil/x86/bswap: force inline asm versions with ICC

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Jul 18 18:29:44 2015 -0300| [bd487645327b207e27aa76b4b30319e1a20d4731] | committer: James Almer

avutil/x86/bswap: force inline asm versions with ICC

Recent ICC versions that define GCC as >= 4.5 (like ICC 13) apparently can't
optimize the generic C versions of av_bswap*() on their own.

Reviewed-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavutil/x86/bswap.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/x86/bswap.h b/libavutil/x86/bswap.h
index 08e2a62..67f1747 100644
--- a/libavutil/x86/bswap.h
+++ b/libavutil/x86/bswap.h
@@ -39,7 +39,7 @@ static av_always_inline av_const unsigned av_bswap16(unsigned x)
 }
 #endif /* !AV_GCC_VERSION_AT_LEAST(4,1) */
 
-#if !AV_GCC_VERSION_AT_LEAST(4,5)
+#if !AV_GCC_VERSION_AT_LEAST(4,5) || defined(__INTEL_COMPILER)
 #define av_bswap32 av_bswap32
 static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
 {