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

lavu/intmath.h: fix compilation with msvc10.

Browse Source 
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
This commit is contained in:
Matt Oliver 2016-06-06 17:02:34 +10:00
parent 37787f2616
commit 5ca44ebd99
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/x86/intmath.h
View File

@ -47,6 +47,7 @@ static av_always_inline av_const int ff_log2_x86(unsigned int v)
# endif # endif
# define ff_log2_16bit av_log2 # define ff_log2_16bit av_log2
#if defined(__INTEL_COMPILER) || (defined(_MSC_VER) && (_MSC_VER >= 1700))
# define ff_ctz(v) _tzcnt_u32(v) # define ff_ctz(v) _tzcnt_u32(v)
# if ARCH_X86_64 # if ARCH_X86_64
@ -58,6 +59,7 @@ static av_always_inline av_const int ff_ctzll_x86(long long v)
return ((uint32_t)v == 0) ? _tzcnt_u32((uint32_t)(v >> 32)) + 32 : _tzcnt_u32((uint32_t)v); return ((uint32_t)v == 0) ? _tzcnt_u32((uint32_t)(v >> 32)) + 32 : _tzcnt_u32((uint32_t)v);
} }
# endif # endif
#endif /* _MSC_VER */
#endif /* __INTEL_COMPILER */ #endif /* __INTEL_COMPILER */