From 618b48e55db7e76514ea040584dadc1cde6ce5a4 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 6 Feb 2012 08:58:26 +0100 Subject: [PATCH 2/2] h264: manually XMM registers for functions using INIT_MMX. On Win64, these registers are callee-save, so not saving/restoring them correctly is a violation of ABI and can lead to crashes or corrupt data. --- libavcodec/x86/h264_idct.asm | 3 +++ libavcodec/x86/h264_intrapred.asm | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm index a132480..5a24b0e 100644 --- a/libavcodec/x86/h264_idct.asm +++ b/libavcodec/x86/h264_idct.asm @@ -968,6 +968,9 @@ cglobal h264_idct_add8_8_sse2, 5, 7, 8 %macro IDCT_DC_DEQUANT 2 cglobal h264_luma_dc_dequant_idct_%1, 3,4,%2 +%if %2 != 0 + WIN64_SPILL_XMM rsp +%endif movq m3, [r1+24] movq m2, [r1+16] movq m1, [r1+ 8] diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm index 61c69c6..f71e144 100644 --- a/libavcodec/x86/h264_intrapred.asm +++ b/libavcodec/x86/h264_intrapred.asm @@ -1931,6 +1931,7 @@ cglobal pred8x8l_vertical_right_mmxext, 4,5 %macro PRED8x8L_VERTICAL_RIGHT 1 cglobal pred8x8l_vertical_right_%1, 4,5,7 + WIN64_SPILL_XMM 7 sub r0, r3 lea r4, [r0+r3*2] movq mm0, [r0+r3*1-8] -- 1.7.5.4