Bug 929398 - Enable vorbis even if webm is disabled. r=ted
authorRalph Giles <giles@mozilla.com>
Tue, 22 Oct 2013 09:55:00 -0700
changeset 151669 1fde59e2a706cc4311a3b6b1ce67e4350a31f7a2
parent 151668 820aa1824ce0e196c2b9fb24adac2bb1c08d4672
child 151670 d8d851a1ed2a199a5116be587222eed6c89b6d6d
push id35277
push userrgiles@mozilla.com
push dateTue, 22 Oct 2013 21:12:20 +0000
treeherdermozilla-inbound@d8d851a1ed2a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs929398
milestone27.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 929398 - Enable vorbis even if webm is disabled. r=ted We enable either vorbis or tremor, depending on the platform, if webm is enabled. Both the webm and the ogg media formats require vorbis support, so the build would fail in the media playback code if just --disable-webm was passed. Instead enable vorbis or tremor if either is enabled.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5364,17 +5364,17 @@ if test -n "$MOZ_VP8"; then
         LIBS=$_SAVE_LIBS
     fi
 fi
 
 AC_SUBST(MOZ_NATIVE_LIBVPX)
 AC_SUBST(MOZ_LIBVPX_CFLAGS)
 AC_SUBST(MOZ_LIBVPX_LIBS)
 
-if test "$MOZ_WEBM"; then
+if test "$MOZ_WEBM" -o "$MOZ_OGG"; then
     MOZ_CUBEB=1
     if test "$MOZ_SAMPLE_TYPE_FLOAT32"; then
         MOZ_VORBIS=1
     else
         MOZ_TREMOR=1
     fi
 fi