diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:14:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:25:47 +0100 |
| commit | 1eb28479dab3d55a9c8aff63e0fb7a1dd3902cf0 (patch) | |
| tree | 8c3e71eec5cdb4399dfd71dd07b2830776015dd9 /libavcodec/x86 | |
| parent | 09f057170e52442a9136b8298bb37897cc81f9e9 (diff) | |
| parent | 48aef27f5232794e70ecef0d347b9f65e27a9bad (diff) | |
Merge commit '48aef27f5232794e70ecef0d347b9f65e27a9bad'
* commit '48aef27f5232794e70ecef0d347b9f65e27a9bad':
x86: Put COPY3_IF_LT under HAVE_6REGS
Conflicts:
libavcodec/x86/mathops.h
See: b38910c9790253b362839042a17e13252c1d4b90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/mathops.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h index 1cca05d658..6298f5ed19 100644 --- a/libavcodec/x86/mathops.h +++ b/libavcodec/x86/mathops.h @@ -23,6 +23,7 @@ #define AVCODEC_X86_MATHOPS_H #include "config.h" + #include "libavutil/common.h" #include "libavutil/x86/asm.h" @@ -100,6 +101,7 @@ __asm__ volatile(\ : "r" (y), "r" (b), "r" (d)\ ); #endif /* HAVE_6REGS */ + #endif /* HAVE_I686 */ #define MASK_ABS(mask, level) \ |