[SCM] libav/experimental: In yadif filter, declare asm constants directly to avoid dependency on libavcodec

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 90f1f3bf0010e9a157df775e188811fe37c6b371
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Dec 6 00:14:15 2010 +0000

    In yadif filter, declare asm constants directly to avoid dependency on libavcodec
    
    Originally committed as revision 25895 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index f117da7..db1e6e3 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -41,7 +41,6 @@ DECLARE_ALIGNED(8,  const uint64_t, ff_wtwo) = 0x0002000200020002ULL;
 DECLARE_ALIGNED(16, const uint64_t, ff_pdw_80000000)[2] =
 {0x8000000080000000ULL, 0x8000000080000000ULL};
 
-DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_1  ) = {0x0001000100010001ULL, 0x0001000100010001ULL};
 DECLARE_ALIGNED(8,  const uint64_t, ff_pw_3  ) = 0x0003000300030003ULL;
 DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_4  ) = {0x0004000400040004ULL, 0x0004000400040004ULL};
 DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_5  ) = {0x0005000500050005ULL, 0x0005000500050005ULL};
diff --git a/libavfilter/x86/yadif.c b/libavfilter/x86/yadif.c
index 8fda59a..2b55c00 100644
--- a/libavfilter/x86/yadif.c
+++ b/libavfilter/x86/yadif.c
@@ -20,8 +20,12 @@
 
 #include "libavutil/cpu.h"
 #include "libavutil/x86_cpu.h"
+#include "libavcodec/x86/dsputil_mmx.h"
 #include "libavfilter/yadif.h"
 
+DECLARE_ASM_CONST(16, const xmm_reg, pb_1) = {0x0101010101010101ULL, 0x0101010101010101ULL};
+DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL, 0x0001000100010001ULL};
+
 #if HAVE_SSSE3
 #define COMPILE_TEMPLATE_SSE 1
 #define COMPILE_TEMPLATE_SSSE3 1
diff --git a/libavfilter/x86/yadif_template.c b/libavfilter/x86/yadif_template.c
index 5788a08..3e520cb 100644
--- a/libavfilter/x86/yadif_template.c
+++ b/libavfilter/x86/yadif_template.c
@@ -62,7 +62,7 @@
             MOVQ"      "MM"2, "MM"5 \n\t"\
             "pxor      "MM"3, "MM"4 \n\t"\
             "pavgb     "MM"3, "MM"5 \n\t"\
-            "pand     "MANGLE(ff_pb_1)", "MM"4 \n\t"\
+            "pand     "MANGLE(pb_1)", "MM"4 \n\t"\
             "psubusb   "MM"4, "MM"5 \n\t"\
             PSRL1(MM"5")                 \
             "punpcklbw "MM"7, "MM"5 \n\t" /* (cur[x-refs+j] + cur[x+refs-j])>>1 */\
@@ -92,7 +92,7 @@
 
 #define CHECK2 /* pretend not to have checked dir=2 if dir=1 was bad.\
                   hurts both quality and speed, but matches the C version. */\
-            "paddw    "MANGLE(ff_pw_1)", "MM"6 \n\t"\
+            "paddw    "MANGLE(pw_1)", "MM"6 \n\t"\
             "psllw     $14,   "MM"6 \n\t"\
             "paddsw    "MM"6, "MM"2 \n\t"\
             MOVQ"      "MM"0, "MM"3 \n\t"\
@@ -167,7 +167,7 @@ void RENAME(ff_yadif_filter_line)(uint8_t *dst,
             "punpcklbw "MM"7, "MM"3 \n\t" /* ABS(cur[x-refs+1] - cur[x+refs+1]) */\
             "paddw     "MM"2, "MM"0 \n\t"\
             "paddw     "MM"3, "MM"0 \n\t"\
-            "psubw    "MANGLE(ff_pw_1)", "MM"0 \n\t" /* spatial_score */\
+            "psubw    "MANGLE(pw_1)", "MM"0 \n\t" /* spatial_score */\
 \
             CHECK(-2,0)\
             CHECK1\

-- 
Libav/FFmpeg packaging