Bug 1215115 - part4: Enable MOZ_WEBM_ENCODER by default. r=ted draft
authorbechen <bechen@mozilla.com>
Fri, 01 Apr 2016 14:04:42 +0800
changeset 346525 342e116389d379f0bc1e8be530ba82c27dc16ef7
parent 346451 bd0dd38ac6946dec582f4a6dc5e2a115d1ec6678
child 517471 943081d555a98db062e851aaac60544e7bc1865e
push id14405
push userbechen@mozilla.com
push dateFri, 01 Apr 2016 08:32:11 +0000
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
@@ -56,16 +56,15 @@ MOZ_PROFILE_MIGRATOR=1
 MOZ_APP_STATIC_INI=1
 MOZ_MEDIA_NAVIGATOR=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
@@ -4302,23 +4302,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