diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-09 13:35:37 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-09 13:36:29 +0400 |
commit | 164899c6e8588c25a1b50d0a0ea285812c36e3d3 (patch) | |
tree | 0a96263d98511208753d8ed5edf8d0ece49a18a8 /libavcodec/x86/vc1dsp_mmx.c | |
parent | 5747d835c775597dcfd8ee1c49dfa5c6fe391c7c (diff) | |
parent | 71469f3b636fbe06b6aca5933f9fdebddd8d5f57 (diff) |
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/vc1dsp_mmx.c')
-rw-r--r-- | libavcodec/x86/vc1dsp_mmx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index 9077c3a4df..c50f779984 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -28,8 +28,9 @@ #include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "dsputil_mmx.h" #include "libavcodec/vc1dsp.h" +#include "constants.h" +#include "dsputil_mmx.h" #include "vc1dsp.h" #if HAVE_INLINE_ASM |