diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-09-18 20:44:32 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-09-18 20:44:32 +0000 |
| commit | f41237c9dbe9751ef025812edebdec762797e57d (patch) | |
| tree | 97ec3d784ef8c0e6e09e2c282fe07a9c7245b370 /libavcodec | |
| parent | 217d3d8fe928ed9818c11e0507db0061f9faae3f (diff) | |
| download | ffmpeg-f41237c9dbe9751ef025812edebdec762797e57d.tar.gz | |
x86: remove hack disabling sse2 h264 loop filter with 32-bit icc
Originally committed as revision 25146 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/h264dsp_mmx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/x86/h264dsp_mmx.c b/libavcodec/x86/h264dsp_mmx.c index d81c2819c3..fd21d8cc2e 100644 --- a/libavcodec/x86/h264dsp_mmx.c +++ b/libavcodec/x86/h264dsp_mmx.c @@ -326,12 +326,11 @@ void ff_h264dsp_init_x86(H264DSPContext *c) 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; |