From c46819f2299c73cd1bfa8ef04d08b0153a5699d3 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 10 Apr 2013 12:34:10 +0300 Subject: [PATCH] x86: Move constants to the only place where they are used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavcodec/x86/dsputil_mmx.c | 3 --- libavcodec/x86/dsputil_mmx.h | 3 --- libavcodec/x86/vp3dsp.asm | 7 ++++--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index f991bbef10..a28ddb90bf 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -47,10 +47,7 @@ DECLARE_ALIGNED(8, const uint64_t, ff_pw_255) = 0x00ff00ff00ff00ffULL; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_512) = { 0x0200020002000200ULL, 0x0200020002000200ULL }; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_1019) = { 0x03FB03FB03FB03FBULL, 0x03FB03FB03FB03FBULL }; -DECLARE_ALIGNED(8, const uint64_t, ff_pb_7) = 0x0707070707070707ULL; -DECLARE_ALIGNED(8, const uint64_t, ff_pb_1F) = 0x1F1F1F1F1F1F1F1FULL; DECLARE_ALIGNED(8, const uint64_t, ff_pb_3F) = 0x3F3F3F3F3F3F3F3FULL; -DECLARE_ALIGNED(8, const uint64_t, ff_pb_81) = 0x8181818181818181ULL; DECLARE_ALIGNED(8, const uint64_t, ff_pb_FC) = 0xFCFCFCFCFCFCFCFCULL; DECLARE_ALIGNED(16, const double, ff_pd_1)[2] = { 1.0, 1.0 }; diff --git a/libavcodec/x86/dsputil_mmx.h b/libavcodec/x86/dsputil_mmx.h index 40fcdf922e..9614e6cab9 100644 --- a/libavcodec/x86/dsputil_mmx.h +++ b/libavcodec/x86/dsputil_mmx.h @@ -49,10 +49,7 @@ extern const uint64_t ff_pw_255; extern const xmm_reg ff_pb_1; extern const xmm_reg ff_pb_3; -extern const uint64_t ff_pb_7; -extern const uint64_t ff_pb_1F; extern const uint64_t ff_pb_3F; -extern const uint64_t ff_pb_81; extern const xmm_reg ff_pb_F8; extern const uint64_t ff_pb_FC; diff --git a/libavcodec/x86/vp3dsp.asm b/libavcodec/x86/vp3dsp.asm index d2c464c5cf..078e9db99a 100644 --- a/libavcodec/x86/vp3dsp.asm +++ b/libavcodec/x86/vp3dsp.asm @@ -33,12 +33,13 @@ vp3_idct_data: times 8 dw 64277 times 8 dw 25080 times 8 dw 12785 +pb_7: times 8 db 0x07 +pb_1F: times 8 db 0x1f +pb_81: times 8 db 0x81 + cextern pb_1 cextern pb_3 -cextern pb_7 -cextern pb_1F cextern pb_80 -cextern pb_81 cextern pw_8