[FFmpeg-cvslog] x86/cpu: check for OS support before enabling AVX2

[James Almer]

ffmpeg | branch: release/2.2 | James Almer <jamrial at gmail.com> | Tue Mar 25 05:27:08 2014 -0300| [1103aec1df38df79abe2c2689818ca295383d9ed] | committer: Michael Niedermayer

x86/cpu: check for OS support before enabling AVX2

AV_CPU_FLAG_AVX is enabled at this point only if there's OS support.

Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 2d9821a2081aff5dca253386c6e7e71a04509cff)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1103aec1df38df79abe2c2689818ca295383d9ed
---

 libavutil/x86/cpu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index 356cd44..8ad4784 100644
--- a/libavutil/x86/cpu.c
+++ b/libavutil/x86/cpu.c
@@ -143,7 +143,7 @@ int ff_get_cpu_flags_x86(void)
     if (max_std_level >= 7) {
         cpuid(7, eax, ebx, ecx, edx);
 #if HAVE_AVX2
-        if (ebx & 0x00000020)
+        if ((rval & AV_CPU_FLAG_AVX) && (ebx & 0x00000020))
             rval |= AV_CPU_FLAG_AVX2;
 #endif /* HAVE_AVX2 */
         /* BMI1/2 don't need OS support */