[FFmpeg-cvslog] configure: fix NASM output format on Win64

James Almer git at videolan.org
Thu Jun 19 13:24:23 CEST 2014


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Jun 19 02:25:51 2014 -0300| [60a06400a9fadb542bf8c7679bbbb17094edb71e] | committer: Michael Niedermayer

configure: fix NASM output format on Win64

Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 configure |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index af40d34..ccd5845 100755
--- a/configure
+++ b/configure
@@ -4467,7 +4467,12 @@ EOF
         elif check_cmd nasm -v; then
             yasmexe=nasm
             yasm_debug="-g -F dwarf"
-            enabled x86_64 && test "$objformat" = elf && objformat=elf64
+            if enabled x86_64; then
+                case "$objformat" in
+                    elf)   objformat=elf64 ;;
+                    win32) objformat=win64 ;;
+                esac
+            fi
         fi
 
         YASMFLAGS="-f $objformat $yasm_extra"



More information about the ffmpeg-cvslog mailing list