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/constants.c | |
| 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/constants.c')
| -rw-r--r-- | libavcodec/x86/constants.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/x86/constants.c b/libavcodec/x86/constants.c index b532e6bdd5..3bba80bd87 100644 --- a/libavcodec/x86/constants.c +++ b/libavcodec/x86/constants.c @@ -20,6 +20,7 @@ #include "libavutil/mem.h" #include "libavutil/x86/asm.h" // for xmm_reg +#include "constants.h" DECLARE_ALIGNED(8, const uint64_t, ff_wtwo) = 0x0002000200020002ULL; |