# HG changeset patch
# User conrad
# Date 1279706523 0
# Node ID fe243bb5ef61feaf92abaedc911815a633467735
# Parent  d38e8565ba0577830e129ba50b829a11e741679e
Move ff_pw_* from vc1dsp_mmx.c to dsputil_mmx.c

Should fix compilation with icc and should help prevent any future duplicates

diff -r d38e8565ba05 -r fe243bb5ef61 x86/dsputil_mmx.c
--- a/x86/dsputil_mmx.c	Tue Jul 20 22:58:56 2010 +0000
+++ b/x86/dsputil_mmx.c	Wed Jul 21 10:02:03 2010 +0000
@@ -59,6 +59,7 @@
 DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_28 ) = {0x001C001C001C001CULL, 0x001C001C001C001CULL};
 DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_32 ) = {0x0020002000200020ULL, 0x0020002000200020ULL};
 DECLARE_ALIGNED(8,  const uint64_t, ff_pw_42 ) = 0x002A002A002A002AULL;
+DECLARE_ALIGNED(8,  const uint64_t, ff_pw_53 ) = 0x0035003500350035ULL;
 DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_63 ) = {0x003F003F003F003FULL, 0x003F003F003F003FULL};
 DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_64 ) = {0x0040004000400040ULL, 0x0040004000400040ULL};
 DECLARE_ALIGNED(8,  const uint64_t, ff_pw_96 ) = 0x0060006000600060ULL;
diff -r d38e8565ba05 -r fe243bb5ef61 x86/vc1dsp_mmx.c
--- a/x86/vc1dsp_mmx.c	Tue Jul 20 22:58:56 2010 +0000
+++ b/x86/vc1dsp_mmx.c	Wed Jul 21 10:02:03 2010 +0000
@@ -213,13 +213,6 @@
 VC1_SHIFT2(OP_AVG, avg_)
 
 /**
- * Filter coefficients made global to allow access by all 1 or 3 quarter shift
- * interpolation functions.
- */
-DECLARE_ASM_CONST(16, uint64_t, ff_pw_53) = 0x0035003500350035ULL;
-DECLARE_ASM_CONST(16, uint64_t, ff_pw_18) = 0x0012001200120012ULL;
-
-/**
  * Core of the 1/4 and 3/4 shift bicubic interpolation.
  *
  * @param UNPACK  Macro unpacking arguments from 8 to 16bits (can be empty).