| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 09:37:18 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 09:37:22 (GMT) |
| commit | 3f965ab95d94ee39c70b4711a8680f41575996c1 (patch) | |
| tree | d778556a0c84e460b07d3204bc318e36e6ac2a59 | |
| parent | 1f17619fe4800dce32a81fda0cec9afad91ff095 (diff) | |
| parent | 47f9d7ce5493e119e09d1227d017414feaaf8d97 (diff) | |
| download | ffmpeg-3f965ab95d94ee39c70b4711a8680f41575996c1.zip ffmpeg-3f965ab95d94ee39c70b4711a8680f41575996c1.tar.gz ffmpeg-3f965ab95d94ee39c70b4711a8680f41575996c1.tar.bz2 | |
Merge commit '47f9d7ce5493e119e09d1227d017414feaaf8d97'
* commit '47f9d7ce5493e119e09d1227d017414feaaf8d97':
x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64"
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/x86/x86inc.asm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index cb3f82b..d07e171 100644 --- 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 |