[x264-devel] commit: nasm doesn't like align(nop) in structs (Loren Merritt )

git version control git at videolan.org
Tue Mar 25 06:36:23 CET 2008


x264 | branch: master | Loren Merritt <pengvado at akuvian.org> | Mon Mar 24 21:31:46 2008 -0600| [261873ec7737bd4e71fdce45608ef46b0cc0472d]

nasm doesn't like align(nop) in structs

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=261873ec7737bd4e71fdce45608ef46b0cc0472d
---

 common/x86/cabac-a.asm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/x86/cabac-a.asm b/common/x86/cabac-a.asm
index 9c21096..1708a06 100644
--- a/common/x86/cabac-a.asm
+++ b/common/x86/cabac-a.asm
@@ -54,11 +54,11 @@ struc cb
     .start: pointer 1
     .p: pointer 1
     .end: pointer 1
-    align 16
+    align 16, resb 1
     .bits_encoded: resd 1
     .state: resb 460
 endstruc
-    
+
 %macro LOAD_GLOBAL 4
 %ifdef PIC64
     ; this would be faster if the arrays were declared in asm, so that I didn't have to duplicate the lea



More information about the x264-devel mailing list