[FFmpeg-cvslog] h264: fix 10bit biweight functions after recent x86inc.asm fixes.

Ronald S. Bultje git at videolan.org
Fri Apr 13 22:12:31 CEST 2012


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Thu Apr 12 09:45:10 2012 -0700| [76538d7a78264eb0ce82f9f7f49f6fdbdcfc89ab] | committer: Ronald S. Bultje

h264: fix 10bit biweight functions after recent x86inc.asm fixes.

This should have been updated in the x86inc.asm update, but was
accidently forgotten.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76538d7a78264eb0ce82f9f7f49f6fdbdcfc89ab
---

 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 481c7ca..c4b1298 100644
--- a/libavcodec/x86/h264_weight_10bit.asm
+++ b/libavcodec/x86/h264_weight_10bit.asm
@@ -155,7 +155,7 @@ WEIGHT_FUNC_HALF_MM sse4
 %if ARCH_X86_32
 DECLARE_REG_TMP 3
 %else
-DECLARE_REG_TMP 10
+DECLARE_REG_TMP 7
 %endif
 
 %macro BIWEIGHT_PROLOGUE 0
@@ -218,7 +218,7 @@ DECLARE_REG_TMP 10
 %endmacro
 
 %macro BIWEIGHT_FUNC_DBL 1
-cglobal h264_biweight_16_10_%1
+cglobal h264_biweight_16_10_%1, 0, 8, 8
     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
+cglobal h264_biweight_8_10_%1, 0, 8, 8
     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
+cglobal h264_biweight_4_10_%1, 0, 8, 8
     BIWEIGHT_PROLOGUE
     BIWEIGHT_SETUP %1
     sar        r3d, 1



More information about the ffmpeg-cvslog mailing list