[FFmpeg-cvslog] r16373 - trunk/libavcodec/x86/dsputil_mmx.c

cehoyos subversion
Sun Dec 28 20:40:13 CET 2008


Author: cehoyos
Date: Sun Dec 28 20:40:13 2008
New Revision: 16373

Log:
Fix h264 decoding on SSE2 cores with icc compilation.

Modified:
   trunk/libavcodec/x86/dsputil_mmx.c

Modified: trunk/libavcodec/x86/dsputil_mmx.c
==============================================================================
--- trunk/libavcodec/x86/dsputil_mmx.c	Sun Dec 28 18:07:47 2008	(r16372)
+++ trunk/libavcodec/x86/dsputil_mmx.c	Sun Dec 28 20:40:13 2008	(r16373)
@@ -2872,12 +2872,14 @@ void dsputil_init_mmx(DSPContext* c, AVC
             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
 




More information about the ffmpeg-cvslog mailing list