Bug 1481513 - disable ffvpx on aarch64 windows; r=gps
authorNathan Froyd <froydnj@mozilla.com>
Tue, 28 Aug 2018 13:44:54 -0400
changeset 488766 64213b300680bd87b79990b63a9304f80034a664
parent 488765 fb80a4f44ac2a1ea9007d72593521dde33e4d2bc
child 488767 23e112bfaf97817122b1f3bae3e9ecf4ff9d63ef
push id9734
push usershindli@mozilla.com
push dateThu, 30 Aug 2018 12:18:07 +0000
treeherdermozilla-beta@71c71ab3afae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1481513
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1481513 - disable ffvpx on aarch64 windows; r=gps There's no support for it in our local tree.
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -2928,21 +2928,28 @@ case "$CPU_ARCH" in
       else
           dnl On x86 system with assembly optimizations disabled, the ffvp9 and
           dnl ffvp8 decoders give worse performance than libvpx ones. So we only
           dnl enable the FFmpeg FLAC decoder on those machines.
           MOZ_FFVPX_FLACONLY=1
       fi
   ;;
   arm*|aarch64)
-      MOZ_FFVPX=1
-      MOZ_FFVPX_FLACONLY=1
-      dnl Use same conditional as MOZ_LIBVPX to enable FFmpeg's ffvpx assembly decoder.
-      dnl aarch 64 FLAC decoder for now will be C only.
-      FFVPX_ASFLAGS=$VPX_ASFLAGS
+      case "$OS_TARGET" in
+        WINNT)
+          dnl don't set up anything special
+          ;;
+        *)
+          MOZ_FFVPX=1
+          MOZ_FFVPX_FLACONLY=1
+          dnl Use same conditional as MOZ_LIBVPX to enable FFmpeg's ffvpx assembly decoder.
+          dnl aarch 64 FLAC decoder for now will be C only.
+          FFVPX_ASFLAGS=$VPX_ASFLAGS
+          ;;
+      esac
   ;;
 esac
 
 if test -n "$MOZ_FFVPX"; then
   AC_DEFINE(MOZ_FFVPX)
 fi
 if test -n "$MOZ_FFVPX_FLACONLY"; then
   AC_DEFINE(MOZ_FFVPX_FLACONLY)