From 2c67c659639f3350e9e28d21bdcfc2dc76d4375b Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 28 Dec 2008 19:40:13 +0000 Subject: [PATCH] Fix h264 decoding on SSE2 cores with icc compilation. Originally committed as revision 16373 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/x86/dsputil_mmx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index fd57079..52eaccd 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -2872,12 +2872,14 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) c->h264_v_loop_filter_luma_intra = ff_x264_deblock_v_luma_intra_mmxext; c->h264_h_loop_filter_luma_intra = ff_x264_deblock_h_luma_intra_mmxext; #endif +#if defined(ARCH_X86_64) || !defined(__ICC) || __ICC > 1100 if( mm_flags&FF_MM_SSE2 ){ c->h264_v_loop_filter_luma = ff_x264_deblock_v_luma_sse2; c->h264_h_loop_filter_luma = ff_x264_deblock_h_luma_sse2; c->h264_v_loop_filter_luma_intra = ff_x264_deblock_v_luma_intra_sse2; c->h264_h_loop_filter_luma_intra = ff_x264_deblock_h_luma_intra_sse2; } +#endif } #endif -- 2.7.4