| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 09:57:33 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 09:57:39 (GMT) |
| commit | 31d9aa6b2e1a69379ebf1cf1b5449ff1bd98e0fa (patch) | |
| tree | 7034eb90801fd04f7e1a14823a7aebce5de10a0b | |
| parent | 3f965ab95d94ee39c70b4711a8680f41575996c1 (diff) | |
| parent | 71155665414b551ad350622d5abed20e58371fbf (diff) | |
| download | ffmpeg-31d9aa6b2e1a69379ebf1cf1b5449ff1bd98e0fa.zip ffmpeg-31d9aa6b2e1a69379ebf1cf1b5449ff1bd98e0fa.tar.gz ffmpeg-31d9aa6b2e1a69379ebf1cf1b5449ff1bd98e0fa.tar.bz2 | |
Merge commit '71155665414b551ad350622d5abed20e58371fbf'
* commit '71155665414b551ad350622d5abed20e58371fbf':
x86inc: various minor backports from x264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/x86/x86inc.asm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index d07e171..284ebdc 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* x86inc.asm: x264asm abstraction layer ;***************************************************************************** -;* Copyright (C) 2005-2012 x264 project +;* Copyright (C) 2005-2013 x264 project ;* ;* Authors: Loren Merritt <lorenm@u.washington.edu> ;* Anton Mitrofanov <BugMaster@narod.ru> @@ -779,9 +779,8 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits %assign cpuflags_misalign (1<<20) %assign cpuflags_aligned (1<<21) ; not a cpu feature, but a function variant %assign cpuflags_atom (1<<22) -%assign cpuflags_bmi1 (1<<23) +%assign cpuflags_bmi1 (1<<23)|cpuflags_lzcnt %assign cpuflags_bmi2 (1<<24)|cpuflags_bmi1 -%assign cpuflags_tbm (1<<25)|cpuflags_bmi1 %define cpuflag(x) ((cpuflags & (cpuflags_ %+ x)) == (cpuflags_ %+ x)) %define notcpuflag(x) ((cpuflags & (cpuflags_ %+ x)) != (cpuflags_ %+ x)) |