summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-08-30 11:47:37 +0200
committerGitHub <noreply@github.com>2018-08-30 11:47:37 +0200
commitf266d26ebd89a8f7de55c53939e6fac0ff463940 (patch)
tree3574097e9597b8c6c0b2cea6ab31e4786045e110
parent0bc2511432fe0cdcae92aae71576b6eb9bad7f5c (diff)
parenta64465bde4d8889c062179a791357a8d608d4e0c (diff)
downloadUXP-f266d26ebd89a8f7de55c53939e6fac0ff463940.tar
UXP-f266d26ebd89a8f7de55c53939e6fac0ff463940.tar.gz
UXP-f266d26ebd89a8f7de55c53939e6fac0ff463940.tar.lz
UXP-f266d26ebd89a8f7de55c53939e6fac0ff463940.tar.xz
UXP-f266d26ebd89a8f7de55c53939e6fac0ff463940.zip
Merge pull request #741 from trav90/media-work
Don't build ffvpx on 32-bit platforms (except Windows)
-rw-r--r--old-configure.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/old-configure.in b/old-configure.in
index 6cf0afdb8..96bb934e1 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -3542,11 +3542,15 @@ dnl = FFmpeg's ffvpx configuration
dnl ========================================================
MOZ_FFVPX=
-case "$CPU_ARCH" in
- x86)
+
+dnl Build ffvpx on 32-bit Windows and all supported 64-bit platforms.
+dnl 32-bit *nix has performance issues due to not supporting assembly decoder.
+
+case "$OS_ARCH:$CPU_ARCH" in
+ WINNT:x86)
MOZ_FFVPX=1
;;
- x86_64)
+ *:x86_64)
MOZ_FFVPX=1
;;
esac