[FFmpeg-cvslog] r25146 - trunk/libavcodec/x86/h264dsp_mmx.c

[mru]

Author: mru
Date: Sat Sep 18 22:44:32 2010
New Revision: 25146

Log:
x86: remove hack disabling sse2 h264 loop filter with 32-bit icc

Modified:
   trunk/libavcodec/x86/h264dsp_mmx.c

Modified: trunk/libavcodec/x86/h264dsp_mmx.c
==============================================================================
--- trunk/libavcodec/x86/h264dsp_mmx.c	Sat Sep 18 22:44:29 2010	(r25145)
+++ trunk/libavcodec/x86/h264dsp_mmx.c	Sat Sep 18 22:44:32 2010	(r25146)
@@ -326,12 +326,11 @@ void ff_h264dsp_init_x86(H264DSPContext 
                 c->biweight_h264_pixels_tab[3]= ff_h264_biweight_8x8_sse2;
                 c->biweight_h264_pixels_tab[4]= ff_h264_biweight_8x4_sse2;
 
-#if ARCH_X86_64 || !defined(__ICC) || __ICC > 1110
                 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
+
                 c->h264_idct_add16 = ff_h264_idct_add16_sse2;
                 c->h264_idct_add8  = ff_h264_idct_add8_sse2;
                 c->h264_idct_add16intra = ff_h264_idct_add16intra_sse2;