diff options
| author | Daniel Kang <daniel.d.kang@gmail.com> | 2011-05-31 23:10:51 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-31 21:43:20 -0700 |
| commit | f3aa65af3a84c787b0fa8b8cf0881fc05668a24c (patch) | |
| tree | 978e2c475144eaeb6301ebfe6f30475b36c89806 | |
| parent | 348493db60de19d1997fd2861e130720218b9fcf (diff) | |
| download | ffmpeg-f3aa65af3a84c787b0fa8b8cf0881fc05668a24c.tar.gz | |
h264/10bit: add HAVE_ALIGNED_STACK checks.
Fixes regression in 836f47d34b49e8ba9883e738a42f154130421caa in ICC-10.x,
since ICC<=11.0 doesn't align stack upon function calls.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| -rw-r--r-- | libavcodec/x86/h264dsp_mmx.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/x86/h264dsp_mmx.c b/libavcodec/x86/h264dsp_mmx.c index 1a31e41a43..3fccd081d5 100644 --- a/libavcodec/x86/h264dsp_mmx.c +++ b/libavcodec/x86/h264dsp_mmx.c @@ -445,12 +445,14 @@ void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth) if (mm_flags&AV_CPU_FLAG_SSE2) { c->h264_idct_add = ff_h264_idct_add_10_sse2; c->h264_idct8_dc_add = ff_h264_idct8_dc_add_10_sse2; - c->h264_idct8_add = ff_h264_idct8_add_10_sse2; c->h264_idct_add16 = ff_h264_idct_add16_10_sse2; - c->h264_idct8_add4 = ff_h264_idct8_add4_10_sse2; c->h264_idct_add8 = ff_h264_idct_add8_10_sse2; c->h264_idct_add16intra= ff_h264_idct_add16intra_10_sse2; +#if HAVE_ALIGNED_STACK + c->h264_idct8_add = ff_h264_idct8_add_10_sse2; + c->h264_idct8_add4 = ff_h264_idct8_add4_10_sse2; +#endif c->h264_v_loop_filter_chroma= ff_deblock_v_chroma_10_sse2; c->h264_v_loop_filter_chroma_intra= ff_deblock_v_chroma_intra_10_sse2; @@ -465,13 +467,15 @@ void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth) if (mm_flags&AV_CPU_FLAG_AVX) { c->h264_idct_dc_add = c->h264_idct_add = ff_h264_idct_add_10_avx; - c->h264_idct8_add = ff_h264_idct8_add_10_avx; c->h264_idct8_dc_add = ff_h264_idct8_dc_add_10_avx; c->h264_idct_add16 = ff_h264_idct_add16_10_avx; - c->h264_idct8_add4 = ff_h264_idct8_add4_10_avx; c->h264_idct_add8 = ff_h264_idct_add8_10_avx; c->h264_idct_add16intra= ff_h264_idct_add16intra_10_avx; +#if HAVE_ALIGNED_STACK + c->h264_idct8_add = ff_h264_idct8_add_10_avx; + c->h264_idct8_add4 = ff_h264_idct8_add4_10_avx; +#endif c->h264_v_loop_filter_chroma= ff_deblock_v_chroma_10_avx; c->h264_v_loop_filter_chroma_intra= ff_deblock_v_chroma_intra_10_avx; |