diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:13:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:13:48 +0200 |
| commit | e3869dd17ee15a1732dacba24e4cff36dd3d4cc5 (patch) | |
| tree | 8c40ed54496918591a53eaef3a071975e3a6d98a /libavcodec | |
| parent | 69d2eff5af67e9bc461f64dfd3014009f5c851b2 (diff) | |
| parent | 1b343cedd7cd68e7865aa5280d1568c7e5d79917 (diff) | |
| download | ffmpeg-e3869dd17ee15a1732dacba24e4cff36dd3d4cc5.tar.gz | |
Merge commit '1b343cedd7cd68e7865aa5280d1568c7e5d79917'
* commit '1b343cedd7cd68e7865aa5280d1568c7e5d79917':
x86: dsputil: Remove unused ff_pb_3F constant
x86: dsputil: Remove unused MOVQ_BONE macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/constants.c | 1 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 1 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.h | 9 |
3 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/x86/constants.c b/libavcodec/x86/constants.c index 7c2ddc6067..8904f239ba 100644 --- a/libavcodec/x86/constants.c +++ b/libavcodec/x86/constants.c @@ -21,7 +21,6 @@ #include "libavutil/mem.h" #include "libavutil/x86/asm.h" // for xmm_reg -DECLARE_ALIGNED(8, const uint64_t, ff_bone) = 0x0101010101010101ULL; DECLARE_ALIGNED(8, const uint64_t, ff_wtwo) = 0x0002000200020002ULL; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_1) = { 0x0001000100010001ULL, 0x0001000100010001ULL }; diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index a7c958d15e..c57a31e336 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -49,7 +49,6 @@ 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_3F) = 0x3F3F3F3F3F3F3F3FULL; 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 db55cdd948..ce6bc80ac9 100644 --- a/libavcodec/x86/dsputil_mmx.h +++ b/libavcodec/x86/dsputil_mmx.h @@ -28,7 +28,6 @@ #include "libavcodec/dsputil.h" #include "libavutil/x86/asm.h" -extern const uint64_t ff_bone; extern const uint64_t ff_wtwo; extern const xmm_reg ff_pw_3; @@ -49,7 +48,6 @@ 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_3F; extern const xmm_reg ff_pb_F8; extern const uint64_t ff_pb_FC; @@ -81,17 +79,10 @@ extern const double ff_pd_2[2]; "paddb %%"#regd", %%"#regd" \n\t" ::) #ifndef PIC -#define MOVQ_BONE(regd) __asm__ volatile ("movq %0, %%"#regd" \n\t" :: "m"(ff_bone)) #define MOVQ_WTWO(regd) __asm__ volatile ("movq %0, %%"#regd" \n\t" :: "m"(ff_wtwo)) #else // for shared library it's better to use this way for accessing constants // pcmpeqd -> -1 -#define MOVQ_BONE(regd) \ - __asm__ volatile ( \ - "pcmpeqd %%"#regd", %%"#regd" \n\t" \ - "psrlw $15, %%"#regd" \n\t" \ - "packuswb %%"#regd", %%"#regd" \n\t" ::) - #define MOVQ_WTWO(regd) \ __asm__ volatile ( \ "pcmpeqd %%"#regd", %%"#regd" \n\t" \ |