Merge commit '47f9d7ce5493e119e09d1227d017414feaaf8d97'

* commit '47f9d7ce5493e119e09d1227d017414feaaf8d97': x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64" Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 3f965ab95d
parent 1f17619fe4 47f9d7ce54
commit 3f965ab95d
1 changed files with 2 additions and 0 deletions
--- a/libavutil/x86/x86inc.asm
+++ b/libavutil/x86/x86inc.asm
@ -49,6 +49,8 @@
        %define WIN64  1
    %elifidn __OUTPUT_FORMAT__,win64
        %define WIN64  1
+    %elifidn __OUTPUT_FORMAT__,x64
+        %define WIN64  1
    %else
        %define UNIX64 1
    %endif