# HG changeset patch # User cehoyos # Date 1230493213 0 # Node ID c45cc4e913dd9904ead5ce4fb9fc8290c180e6b2 # Parent 2c7e8fe5fc6a07e04baf1d6585b4e6bfa621379d Fix h264 decoding on SSE2 cores with icc compilation. diff -r 2c7e8fe5fc6a -r c45cc4e913dd x86/dsputil_mmx.c --- a/x86/dsputil_mmx.c Sat Dec 27 23:12:00 2008 +0000 +++ b/x86/dsputil_mmx.c Sun Dec 28 19:40:13 2008 +0000 @@ -2872,12 +2872,14 @@ 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