Commit 2a302396 authored by Oskar Arvidsson's avatar Oskar Arvidsson Committed by Fiona Glaser
Browse files

Fix build error in high depth

Caused by multiple definitions of x264_add8x8_idct_sse2.
parent 972de279
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
SECTION .text SECTION .text
%ifndef HIGH_BIT_DEPTH
cextern pw_32 cextern pw_32
cextern hsub_mul cextern hsub_mul
...@@ -479,3 +480,4 @@ global add8x8_idct8_sse2.skip_prologue ...@@ -479,3 +480,4 @@ global add8x8_idct8_sse2.skip_prologue
DIFFx2 m0, m2, m6, m7, [r0+2*FDEC_STRIDE], [r0+3*FDEC_STRIDE]; m5 DIFFx2 m0, m2, m6, m7, [r0+2*FDEC_STRIDE], [r0+3*FDEC_STRIDE]; m5
STORE_IDCT m1, m3, m5, m2 STORE_IDCT m1, m3, m5, m2
ret ret
%endif ; !HIGH_BIT_DEPTH
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
SECTION .text SECTION .text
%ifndef HIGH_BIT_DEPTH
cextern pw_32 cextern pw_32
cextern hsub_mul cextern hsub_mul
INIT_XMM INIT_XMM
...@@ -277,3 +278,4 @@ global add8x8_idct_sse2.skip_prologue ...@@ -277,3 +278,4 @@ global add8x8_idct_sse2.skip_prologue
DIFFx2 m6, m7, m8, m9, [r0+2*FDEC_STRIDE], [r0+3*FDEC_STRIDE] DIFFx2 m6, m7, m8, m9, [r0+2*FDEC_STRIDE], [r0+3*FDEC_STRIDE]
STORE_IDCT m1, m3, m5, m7 STORE_IDCT m1, m3, m5, m7
ret ret
%endif ; !HIGH_BIT_DEPTH
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment