[FFmpeg-cvslog] Merge commit 'b9ea301e02472d0982b0fa0f80294bd95885bde8'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 29 21:06:25 2018 -0300| [3bbec8e7c20b0f8b7b85a173bd006a76bb0c2601] | committer: James Almer

Merge commit 'b9ea301e02472d0982b0fa0f80294bd95885bde8'

* commit 'b9ea301e02472d0982b0fa0f80294bd95885bde8':
  configure: Use a more sensible suffix for x86 assembly tempfiles

Merged-by: James Almer <jamrial at gmail.com>

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

 configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index d233d1ed9e..0beeb43f07 100755
--- a/configure
+++ b/configure
@@ -1029,10 +1029,10 @@ check_insn(){
 
 test_x86asm(){
     log test_x86asm "$@"
-    echo "$1" > $TMPS
-    log_file $TMPS
+    echo "$1" > $TMPASM
+    log_file $TMPASM
     shift 1
-    test_cmd $x86asmexe $X86ASMFLAGS -Werror "$@" -o $TMPO $TMPS
+    test_cmd $x86asmexe $X86ASMFLAGS -Werror "$@" -o $TMPO $TMPASM
 }
 
 ld_o(){


======================================================================

diff --cc configure
index d233d1ed9e,2dc7dd3f8c..0beeb43f07
--- a/configure
+++ b/configure
@@@ -1029,10 -846,10 +1029,10 @@@ check_insn()
  
  test_x86asm(){
      log test_x86asm "$@"
-     echo "$1" > $TMPS
-     log_file $TMPS
+     echo "$1" > $TMPASM
+     log_file $TMPASM
      shift 1
-     test_cmd $x86asmexe $X86ASMFLAGS -Werror "$@" -o $TMPO $TMPS
 -    test_cmd $x86asmexe $X86ASMFLAGS "$@" -o $TMPO $TMPASM
++    test_cmd $x86asmexe $X86ASMFLAGS -Werror "$@" -o $TMPO $TMPASM
  }
  
  ld_o(){