[FFmpeg-devel] [PATCH 6/7] swscale: use new constants in assembly

[James Darnley]

---
 libswscale/x86/Makefile      | 1 +
 libswscale/x86/constants.asm | 1 +
 libswscale/x86/output.asm    | 5 +----
 tests/ref/fate/source        | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 libswscale/x86/constants.asm

diff --git a/libswscale/x86/Makefile b/libswscale/x86/Makefile
index 6901207..b08a3ff 100644
--- a/libswscale/x86/Makefile
+++ b/libswscale/x86/Makefile
@@ -11,3 +11,4 @@ OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
 YASM-OBJS                       += x86/input.o                          \
                                    x86/output.o                         \
                                    x86/scale.o                          \
+                                   x86/constants.o                      \
diff --git a/libswscale/x86/constants.asm b/libswscale/x86/constants.asm
new file mode 100644
index 0000000..c144c6e
--- /dev/null
+++ b/libswscale/x86/constants.asm
@@ -0,0 +1 @@
+%include "libavutil/x86/constants.asm"
diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm
index 9ea4af9..51e80b0 100644
--- a/libswscale/x86/output.asm
+++ b/libswscale/x86/output.asm
@@ -21,6 +21,7 @@
 ;******************************************************************************
 
 %include "libavutil/x86/x86util.asm"
+%include "libavutil/x86/constants.inc"
 
 SECTION_RODATA
 
@@ -32,10 +33,6 @@ yuv2yuvX_10_upper:  times 8 dw 0x3ff
 yuv2yuvX_9_upper:   times 8 dw 0x1ff
 pd_4:          times 4 dd 4
 pd_4min0x40000:times 4 dd 4 - (0x40000)
-pw_16:         times 8 dw 16
-pw_32:         times 8 dw 32
-pw_512:        times 8 dw 512
-pw_1024:       times 8 dw 1024
 
 SECTION .text
 
diff --git a/tests/ref/fate/source b/tests/ref/fate/source
index 5bff566..781f4cd 100644
--- a/tests/ref/fate/source
+++ b/tests/ref/fate/source
@@ -16,5 +16,6 @@ libavutil/x86/constants.h
 libavutil/x86_cpu.h
 libswresample/log2_tab.c
 libswscale/log2_tab.c
+libswscale/x86/constants.asm
 tools/uncoded_frame.c
 tools/yuvcmp.c
-- 
2.5.3