ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Jul 19 13:12:52 2014 +0200| [54cba3f53efd80442015a0ba5ba25252e8096290] | committer: Michael Niedermayer
swscale/x86/hscale_fast_bilinear_simd: add inline asm guards Should fix MSVC build Found-by: jamrial Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54cba3f53efd80442015a0ba5ba25252e8096290 --- libswscale/x86/hscale_fast_bilinear_simd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libswscale/x86/hscale_fast_bilinear_simd.c b/libswscale/x86/hscale_fast_bilinear_simd.c index 4e54754..103793d 100644 --- a/libswscale/x86/hscale_fast_bilinear_simd.c +++ b/libswscale/x86/hscale_fast_bilinear_simd.c @@ -25,6 +25,7 @@ #define RET 0xC3 // near return opcode for x86 #define PREFETCH "prefetchnta" +#if HAVE_INLINE_ASM av_cold int ff_init_hscaler_mmxext(int dstW, int xInc, uint8_t *filterCode, int16_t *filter, int32_t *filterPos, int numSplits) @@ -370,3 +371,4 @@ void ff_hcscale_fast_mmxext(SwsContext *c, int16_t *dst1, int16_t *dst2, dst2[i] = src2[srcW-1]*128; } } +#endif //HAVE_INLINE_ASM _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog