generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '1b932eb1508f550fac9e911923a0383efda53aa3'

Browse Source 
* commit '1b932eb1508f550fac9e911923a0383efda53aa3':
  x86: add detection for FMA3 instruction set

Conflicts:
	configure
	libavutil/cpu.h
	libavutil/x86/cpu.c

See: a2af8eddab75f1eac712411e4dde89823c0845e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-23 22:42:43 +01:00
commit d9574069c1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/x86/cpu.c
View File

@ -133,7 +133,7 @@ int ff_get_cpu_flags_x86(void)
xgetbv(0, eax, edx);
if ((eax & 0x6) == 0x6) {
rval |= AV_CPU_FLAG_AVX;
if (ecx&0x00001000)
if (ecx & 0x00001000)
rval |= AV_CPU_FLAG_FMA3;
}
}