[x264-devel] commit: Fix build error in high depth (Oskar Arvidsson )

[git at videolan.org]

x264 | branch: master | Oskar Arvidsson <oskar at irock.se> | Thu Dec  9 12:19:57 2010 +0100| [e8ca7beb5c1432fb1c6f87318cb6704fc2a7e2de] | committer: Jason Garrett-Glaser 

Fix build error in high depth
Caused by multiple definitions of x264_add8x8_idct_sse2.

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

 common/x86/dct-32.asm |    2 ++
 common/x86/dct-64.asm |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/common/x86/dct-32.asm b/common/x86/dct-32.asm
index 713bdc3..fc88504 100644
--- a/common/x86/dct-32.asm
+++ b/common/x86/dct-32.asm
@@ -32,6 +32,7 @@
 
 SECTION .text
 
+%ifndef HIGH_BIT_DEPTH
 cextern pw_32
 cextern hsub_mul
 
@@ -479,3 +480,4 @@ global add8x8_idct8_sse2.skip_prologue
     DIFFx2 m0, m2, m6, m7, [r0+2*FDEC_STRIDE], [r0+3*FDEC_STRIDE]; m5
     STORE_IDCT m1, m3, m5, m2
     ret
+%endif ; !HIGH_BIT_DEPTH
diff --git a/common/x86/dct-64.asm b/common/x86/dct-64.asm
index 1d953ec..31bbd4e 100644
--- a/common/x86/dct-64.asm
+++ b/common/x86/dct-64.asm
@@ -31,6 +31,7 @@
 
 SECTION .text
 
+%ifndef HIGH_BIT_DEPTH
 cextern pw_32
 cextern hsub_mul
 INIT_XMM
@@ -277,3 +278,4 @@ global add8x8_idct_sse2.skip_prologue
     DIFFx2 m6, m7, m8, m9, [r0+2*FDEC_STRIDE], [r0+3*FDEC_STRIDE]
     STORE_IDCT m1, m3, m5, m7
     ret
+%endif ; !HIGH_BIT_DEPTH