Bug 1215115 - part4: Enable MOZ_WEBM_ENCODER by default. r=ted
authorbechen <bechen@mozilla.com>
Fri, 01 Apr 2016 14:04:42 +0800
changeset 317222 11cfc06439f953208d3975ca4488bbbfd8792ed0
parent 317221 908acebd5af42eacff6bf962970956c20fff6a6b
child 317223 3ce2c626f6ba24e4303f2c1f84287f834c952a4b
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-esr52@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1215115
milestone48.0a1
Bug 1215115 - part4: Enable MOZ_WEBM_ENCODER by default. r=ted MozReview-Commit-ID: 6IgZoIhTLM7
browser/confvars.sh
old-configure.in
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -55,16 +55,15 @@ MAR_CHANNEL_ID=firefox-mozilla-central
 MOZ_PROFILE_MIGRATOR=1
 MOZ_APP_STATIC_INI=1
 MOZ_WEBGL_CONFORMANT=1
 # Enable navigator.mozPay
 MOZ_PAY=1
 # Enable activities. These are used for FxOS developers currently.
 MOZ_ACTIVITIES=1
 MOZ_JSDOWNLOADS=1
-MOZ_WEBM_ENCODER=1
 MOZ_RUST_MP4PARSE=1
 
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1
 
 # Include the DevTools client, not just the server (which is the default)
 MOZ_DEVTOOLS=all
--- a/old-configure.in
+++ b/old-configure.in
@@ -4168,23 +4168,20 @@ if test -n "$MOZ_VORBIS" -a -n "$MOZ_TRE
 fi
 
 if test -n "$MOZ_VORBIS"; then
     AC_DEFINE(MOZ_VORBIS)
 fi
 
 if test -n "$MOZ_TREMOR"; then
     AC_DEFINE(MOZ_TREMOR)
-    # Tremor doesn't have an encoder.
-    MOZ_WEBM_ENCODER=
-fi
-
-if test -n "$MOZ_WEBM_ENCODER"; then
-    AC_DEFINE(MOZ_WEBM_ENCODER)
-fi
+fi
+
+MOZ_WEBM_ENCODER=1
+AC_DEFINE(MOZ_WEBM_ENCODER)
 AC_SUBST(MOZ_WEBM_ENCODER)
 
 dnl ==================================
 dnl = Check alsa availability on Linux
 dnl ==================================
 
 dnl If using Linux, ensure that the alsa library is available
 if test "$OS_TARGET" = "Linux"; then