[FFmpeg-cvslog] x86inc: support yasm -f win64 flag also.

Haruhiko Yamagata git at videolan.org
Thu Feb 9 01:46:11 CET 2012


ffmpeg | branch: master | Haruhiko Yamagata <h.yamagata at nifty.com> | Tue Feb  7 12:27:33 2012 -0800| [166f3993776f1713069d6518026da8b48579f633] | committer: Ronald S. Bultje

x86inc: support yasm -f win64 flag also.

This sets __OUTPUT_FORMAT__ to win64 instead of win32, even though both
(through -m amd64) produce 64-bit binary code.

Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

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

 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 7758d1a..b20bb9a 100644
--- a/libavutil/x86/x86inc.asm
+++ b/libavutil/x86/x86inc.asm
@@ -40,6 +40,8 @@
 %if ARCH_X86_64
     %ifidn __OUTPUT_FORMAT__,win32
         %define WIN64  1
+    %elifidn __OUTPUT_FORMAT__,win64
+        %define WIN64  1
     %else
         %define UNIX64 1
     %endif



More information about the ffmpeg-cvslog mailing list