generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avutil/intmath: check for ICC before GCC

Browse Source 
Intel compiler also defines __GNUC__, so the Intel specific intrinsics were not
really being used.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2015-07-18 16:52:42 -03:00
parent 9a829a2b6a
commit 78347549a4
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavutil/intmath.h
View File

@ -39,22 +39,22 @@
*/ */
#if HAVE_FAST_CLZ #if HAVE_FAST_CLZ
#if AV_GCC_VERSION_AT_LEAST(3,4) #if defined( __INTEL_COMPILER )
#ifndef ff_log2
# define ff_log2(x) (31 - __builtin_clz((x)|1))
# ifndef ff_log2_16bit
# define ff_log2_16bit av_log2
# endif
#endif /* ff_log2 */
#elif defined( __INTEL_COMPILER )
#ifndef ff_log2 #ifndef ff_log2
# define ff_log2(x) (_bit_scan_reverse((x)|1)) # define ff_log2(x) (_bit_scan_reverse((x)|1))
# ifndef ff_log2_16bit # ifndef ff_log2_16bit
# define ff_log2_16bit av_log2 # define ff_log2_16bit av_log2
# endif # endif
#endif /* ff_log2 */ #endif /* ff_log2 */
#endif #elif AV_GCC_VERSION_AT_LEAST(3,4)
#ifndef ff_log2
# define ff_log2(x) (31 - __builtin_clz((x)|1))
# ifndef ff_log2_16bit
# define ff_log2_16bit av_log2
# endif
#endif /* ff_log2 */
#endif /* AV_GCC_VERSION_AT_LEAST(3,4) */ #endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
#endif
extern const uint8_t ff_log2_tab[256]; extern const uint8_t ff_log2_tab[256];
@ -115,14 +115,14 @@ static av_always_inline av_const int ff_log2_16bit_c(unsigned int v)
*/ */
#if HAVE_FAST_CLZ #if HAVE_FAST_CLZ
#if AV_GCC_VERSION_AT_LEAST(3,4) #if defined( __INTEL_COMPILER )
#ifndef ff_ctz
#define ff_ctz(v) __builtin_ctz(v)
#endif
#elif defined( __INTEL_COMPILER )
#ifndef ff_ctz #ifndef ff_ctz
#define ff_ctz(v) _bit_scan_forward(v) #define ff_ctz(v) _bit_scan_forward(v)
#endif #endif
#elif AV_GCC_VERSION_AT_LEAST(3,4)
#ifndef ff_ctz
#define ff_ctz(v) __builtin_ctz(v)
#endif
#endif #endif
#endif #endif