[FFmpeg-cvslog] h264: use proper PROLOGUE statement for a function using 8 registers.
Ronald S. Bultje
git at videolan.org
Tue Apr 17 12:27:18 CEST 2012
ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sun Apr 15 08:11:55 2012 -0700| [87a246341b0a87122391f9dbf00cae7bc3a62d90] | committer: Ronald S. Bultje
h264: use proper PROLOGUE statement for a function using 8 registers.
Fixes crashes when using biweight on win64.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87a246341b0a87122391f9dbf00cae7bc3a62d90
---
libavcodec/x86/h264_weight_10bit.asm | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/x86/h264_weight_10bit.asm b/libavcodec/x86/h264_weight_10bit.asm
index c4b1298..dec9aba 100644
--- a/libavcodec/x86/h264_weight_10bit.asm
+++ b/libavcodec/x86/h264_weight_10bit.asm
@@ -160,7 +160,7 @@ DECLARE_REG_TMP 7
%macro BIWEIGHT_PROLOGUE 0
.prologue
- PROLOGUE 0,7,8
+ PROLOGUE 0,8,8
movifnidn r0, r0mp
movifnidn r1, r1mp
movifnidn r2d, r2m
@@ -218,7 +218,7 @@ DECLARE_REG_TMP 7
%endmacro
%macro BIWEIGHT_FUNC_DBL 1
-cglobal h264_biweight_16_10_%1, 0, 8, 8
+cglobal h264_biweight_16_10_%1
BIWEIGHT_PROLOGUE
BIWEIGHT_SETUP %1
.nextrow
@@ -238,7 +238,7 @@ BIWEIGHT_FUNC_DBL sse2
BIWEIGHT_FUNC_DBL sse4
%macro BIWEIGHT_FUNC 1
-cglobal h264_biweight_8_10_%1, 0, 8, 8
+cglobal h264_biweight_8_10_%1
BIWEIGHT_PROLOGUE
BIWEIGHT_SETUP %1
.nextrow
@@ -256,7 +256,7 @@ BIWEIGHT_FUNC sse2
BIWEIGHT_FUNC sse4
%macro BIWEIGHT_FUNC_HALF 1
-cglobal h264_biweight_4_10_%1, 0, 8, 8
+cglobal h264_biweight_4_10_%1
BIWEIGHT_PROLOGUE
BIWEIGHT_SETUP %1
sar r3d, 1
More information about the ffmpeg-cvslog
mailing list