]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Fix h264 decoding on SSE2 cores with icc compilation.
authorcehoyos <cehoyos@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sun, 28 Dec 2008 19:40:13 +0000 (19:40 +0000)
committercehoyos <cehoyos@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sun, 28 Dec 2008 19:40:13 +0000 (19:40 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16373 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/x86/dsputil_mmx.c

index fd57079dfcb0da1598a130fb512dd5af949b716b..52eaccdf8471e94d12eee3acce4c9c5fc7a87bfb 100644 (file)
@@ -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