Merge commit '47f9d7ce5493e119e09d1227d017414feaaf8d97'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 09:37:18 +0000 (11:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 09:37:22 +0000 (11:37 +0200)
* commit '47f9d7ce5493e119e09d1227d017414feaaf8d97':
  x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/x86/x86inc.asm

index cb3f82b21a2d537a5d2805d8ba2717c34a983fd6..d07e17149705950c4c55e3db65974a0d650a5e00 100644 (file)
@@ -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