diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-09 11:35:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-09 11:36:29 +0200 |
| commit | 164899c6e8588c25a1b50d0a0ea285812c36e3d3 (patch) | |
| tree | 0a96263d98511208753d8ed5edf8d0ece49a18a8 /libavcodec/x86/dsputil_mmx.h | |
| parent | 5747d835c775597dcfd8ee1c49dfa5c6fe391c7c (diff) | |
| parent | 71469f3b636fbe06b6aca5933f9fdebddd8d5f57 (diff) | |
| download | ffmpeg-164899c6e8588c25a1b50d0a0ea285812c36e3d3.tar.gz | |
Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'
* commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57':
x86: dsputil: Move constant declarations into separate header
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_mmx.h')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/libavcodec/x86/dsputil_mmx.h b/libavcodec/x86/dsputil_mmx.h index 16711c2038..9bd4015d0d 100644 --- a/libavcodec/x86/dsputil_mmx.h +++ b/libavcodec/x86/dsputil_mmx.h @@ -27,29 +27,7 @@ #include "libavcodec/dsputil.h" #include "libavutil/x86/asm.h" - -extern const uint64_t ff_wtwo; - -extern const xmm_reg ff_pw_3; -extern const xmm_reg ff_pw_4; -extern const xmm_reg ff_pw_5; -extern const xmm_reg ff_pw_8; -extern const uint64_t ff_pw_15; -extern const xmm_reg ff_pw_16; -extern const xmm_reg ff_pw_18; -extern const uint64_t ff_pw_20; -extern const xmm_reg ff_pw_32; -extern const uint64_t ff_pw_42; -extern const uint64_t ff_pw_53; -extern const xmm_reg ff_pw_64; -extern const uint64_t ff_pw_96; -extern const uint64_t ff_pw_128; -extern const uint64_t ff_pw_255; - -extern const xmm_reg ff_pb_1; -extern const xmm_reg ff_pb_3; -extern const xmm_reg ff_pb_F8; -extern const uint64_t ff_pb_FC; +#include "constants.h" #define SBUTTERFLY(a,b,t,n,m)\ "mov" #m " " #a ", " #t " \n\t" /* abcd */\ |