RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '48aef27f5232794e70ecef0d347b9f65e27a9bad' 

* commit '48aef27f5232794e70ecef0d347b9f65e27a9bad':
  x86: Put COPY3_IF_LT under HAVE_6REGS

Conflicts:
	libavcodec/x86/mathops.h

See: b38910c979
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-17 20:14:48 +01:00
parent 09f057170e 48aef27f52
commit 1eb28479da
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/x86/mathops.h
View File

@ -23,6 +23,7 @@
#define AVCODEC_X86_MATHOPS_H #define AVCODEC_X86_MATHOPS_H
#include "config.h" #include "config.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
@ -100,6 +101,7 @@ __asm__ volatile(\
: "r" (y), "r" (b), "r" (d)\ : "r" (y), "r" (b), "r" (d)\
); );
#endif /* HAVE_6REGS */ #endif /* HAVE_6REGS */
#endif /* HAVE_I686 */ #endif /* HAVE_I686 */
#define MASK_ABS(mask, level) \ #define MASK_ABS(mask, level) \