diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-28 19:40:13 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-28 19:40:13 +0000 |
| commit | 2c67c659639f3350e9e28d21bdcfc2dc76d4375b (patch) | |
| tree | 4d4fddecb0b4db4fed7ec82d6aa6af18597dac9b /libavcodec/x86 | |
| parent | 055068d00126165a649bbd51d5dd3789f3f28e07 (diff) | |
| download | ffmpeg-2c67c659639f3350e9e28d21bdcfc2dc76d4375b.tar.gz | |
Fix h264 decoding on SSE2 cores with icc compilation.
Originally committed as revision 16373 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index fd57079dfc..52eaccdf84 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -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 |