diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 20:39:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 20:39:54 +0200 |
| commit | b8d3c3ea86042300dab0b3b9ac31448f47f1c460 (patch) | |
| tree | cf8e61037b5fe70cf2e14d4f7805646de02a8fc1 | |
| parent | e6f17337cf2081ccbf4635095ec3871805185867 (diff) | |
| parent | 2af720fe5f0418612a8fc26b0147a0e10414fcbe (diff) | |
| download | ffmpeg-b8d3c3ea86042300dab0b3b9ac31448f47f1c460.tar.gz | |
Merge commit '2af720fe5f0418612a8fc26b0147a0e10414fcbe' into release/2.4
* commit '2af720fe5f0418612a8fc26b0147a0e10414fcbe':
x86: Put COPY3_IF_LT under HAVE_6REGS
Conflicts:
libavcodec/x86/mathops.h
See: b38910c9790253b362839042a17e13252c1d4b90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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) \ |