[haiku-commits] haiku: hrev47071 - src/add-ons/media/plugins/ffmpeg
- From: js-haiku-commits@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 29 Mar 2014 05:09:55 +0100 (CET)
hrev47071 adds 1 changeset to branch 'master'
old head: a743eac426709ce9644ee4c9c46a4e283ae270c7
new head: 6c958652365063c87e90ebf384d6f52bf571c3c9
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=6c95865+%5Ea743eac
----------------------------------------------------------------------------
6c95865: Replace a few equ with %define to make nasm happy
Interestingly, it only complained about some of them. Changing them all
to %define though, as equ means it should try to evaluate it once, which
of course it can't really if those are ebp+CONSTANT.
Didn't catch those since I wasn't building gcc2h.
Thanks to jessicah for reporting and testing the fix!
[ Jonathan Schleifer <js@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47071
Commit: 6c958652365063c87e90ebf384d6f52bf571c3c9
URL: http://cgit.haiku-os.org/haiku/commit/?id=6c95865
Author: Jonathan Schleifer <js@xxxxxxxxxxx>
Date: Sat Mar 29 04:00:12 2014 UTC
----------------------------------------------------------------------------
3 files changed, 24 insertions(+), 24 deletions(-)
src/add-ons/media/plugins/ffmpeg/yuvrgb_sse.nasm | 16 ++++++++--------
src/add-ons/media/plugins/ffmpeg/yuvrgb_sse2.nasm | 16 ++++++++--------
src/add-ons/media/plugins/ffmpeg/yuvrgb_ssse3.nasm | 16 ++++++++--------
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/plugins/ffmpeg/yuvrgb_sse.nasm
b/src/add-ons/media/plugins/ffmpeg/yuvrgb_sse.nasm
index f4c517f..00441b8 100644
--- a/src/add-ons/media/plugins/ffmpeg/yuvrgb_sse.nasm
+++ b/src/add-ons/media/plugins/ffmpeg/yuvrgb_sse.nasm
@@ -134,17 +134,17 @@ Const128 dw 128
; Packed Convert
; void Convert_YUV422_RGBA32_SSE(void *fromPtr, void *toPtr, int width)
-width equ ebp+16
-toPtr equ ebp+12
-fromPtr equ ebp+8
+%define width ebp+16
+%define toPtr ebp+12
+%define fromPtr ebp+8
; Planar Convert
; void Convert_YUV420P_RGBA32_SSE(void *fromYPtr, void *fromUPtr, void
*fromVPtr, void *toPtr, int width)
-width1 equ ebp+24
-toPtr1 equ ebp+20
-fromVPtr equ ebp+16
-fromUPtr equ ebp+12
-fromYPtr equ ebp+8
+%define width1 ebp+24
+%define toPtr1 ebp+20
+%define fromVPtr ebp+16
+%define fromUPtr ebp+12
+%define fromYPtr ebp+8
SECTION .text align=16
diff --git a/src/add-ons/media/plugins/ffmpeg/yuvrgb_sse2.nasm
b/src/add-ons/media/plugins/ffmpeg/yuvrgb_sse2.nasm
index 864ede7..46ce76e 100644
--- a/src/add-ons/media/plugins/ffmpeg/yuvrgb_sse2.nasm
+++ b/src/add-ons/media/plugins/ffmpeg/yuvrgb_sse2.nasm
@@ -185,16 +185,16 @@ UVMask db 0x01
%endmacro
; void Convert_YUV422_RGBA32_SSE2(void *fromPtr, void *toPtr, int width)
-width equ ebp+16
-toPtr equ ebp+12
-fromPtr equ ebp+8
+%define width ebp+16
+%define toPtr ebp+12
+%define fromPtr ebp+8
; void Convert_YUV420P_RGBA32_SSE2(void *fromYPtr, void *fromUPtr, void
*fromVPtr, void *toPtr, int width)
-width1 equ ebp+24
-toPtr1 equ ebp+20
-fromVPtr equ ebp+16
-fromUPtr equ ebp+12
-fromYPtr equ ebp+8
+%define width1 ebp+24
+%define toPtr1 ebp+20
+%define fromVPtr ebp+16
+%define fromUPtr ebp+12
+%define fromYPtr ebp+8
SECTION .text align=16
diff --git a/src/add-ons/media/plugins/ffmpeg/yuvrgb_ssse3.nasm
b/src/add-ons/media/plugins/ffmpeg/yuvrgb_ssse3.nasm
index 65612fe..8d42dd2 100644
--- a/src/add-ons/media/plugins/ffmpeg/yuvrgb_ssse3.nasm
+++ b/src/add-ons/media/plugins/ffmpeg/yuvrgb_ssse3.nasm
@@ -218,16 +218,16 @@ BConst dw 7258
; void Convert_YUV422_RGBA32_SSSE3(void *fromPtr, void *toPtr, int width)
-width equ ebp+16
-toPtr equ ebp+12
-fromPtr equ ebp+8
+%define width ebp+16
+%define toPtr ebp+12
+%define fromPtr ebp+8
; void Convert_YUV420P_RGBA32_SSSE3(void *fromYPtr, void *fromUPtr, void
*fromVPtr, void *toPtr, int width)
-width1 equ ebp+24
-toPtr1 equ ebp+20
-fromVPtr equ ebp+16
-fromUPtr equ ebp+12
-fromYPtr equ ebp+8
+%define width1 ebp+24
+%define toPtr1 ebp+20
+%define fromVPtr ebp+16
+%define fromUPtr ebp+12
+%define fromYPtr ebp+8
SECTION .text align=16
Other related posts:
- » [haiku-commits] haiku: hrev47071 - src/add-ons/media/plugins/ffmpeg - js-haiku-commits
