[SCM] libav/experimental: Icc 11.1 still does not align the stack pointer, disable some x264 functions.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 36904c4c9fe28f90a573f38b632a70b1e114bd28
Author: Carl Eugen Hoyos <cehoyos at rainbow.studorg.tuwien.ac.at>
Date:   Fri Jul 17 09:07:38 2009 +0000

    Icc 11.1 still does not align the stack pointer, disable some x264 functions.
    
    Originally committed as revision 19454 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index e273258..badf1db 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -2991,7 +2991,7 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
             c->h264_h_loop_filter_luma_intra = ff_x264_deblock_h_luma_intra_mmxext;
 #endif
             if( mm_flags&FF_MM_SSE2 ){
-#if ARCH_X86_64 || !defined(__ICC) || __ICC > 1100
+#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;

-- 
Libav/FFmpeg packaging