Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset d757eeebcc43. r=bustage CLOSED TREE

Browse Source 
Philor suggests I need to clobber.
This commit is contained in:
Ralph Giles 2013-04-12 15:42:24 -07:00
parent ea3b812c31
commit 0292c5b0ee
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -4219,6 +4219,7 @@ MOZ_OMX_PLUGIN=
MOZ_VP8=
MOZ_VP8_ERROR_CONCEALMENT=
MOZ_VP8_ENCODER=
MOZ_WEBVTT=1
MOZ_WEBSPEECH=1
VPX_AS=
VPX_ASFLAGS=
@ -5700,6 +5701,10 @@ if test -n "$MOZ_OPUS"; then
AC_DEFINE(MOZ_OPUS)
fi
if test -n "$MOZ_WEBVTT"; then
AC_DEFINE(MOZ_WEBVTT)
fi
dnl ========================================================
dnl = Check alsa availability on Linux if using sydneyaudio
dnl ========================================================
@ -8904,6 +8909,7 @@ AC_SUBST(MOZ_VORBIS)
AC_SUBST(MOZ_TREMOR)
AC_SUBST(MOZ_OPUS)
AC_SUBST(MOZ_WEBM)
AC_SUBST(MOZ_WEBVTT)
AC_SUBST(MOZ_DASH)
AC_SUBST(MOZ_WMF)
AC_SUBST(MOZ_MEDIA_PLUGINS)

2
layout/media/Makefile.in
View File

@ -114,9 +114,11 @@ ifdef MOZ_ENABLE_SKIA
SHARED_LIBRARY_LIBS += $(MOZ_SKIA_LIBS)
endif
ifdef MOZ_WEBVTT
SHARED_LIBRARY_LIBS += \
$(DEPTH)/media/webvtt/$(LIB_PREFIX)webvtt.$(LIB_SUFFIX) \
$(NULL)
endif
ifdef MOZ_WEBRTC
ifndef MOZ_WEBRTC_IN_LIBXUL

4
toolkit/toolkit.mozbuild
View File

@ -76,6 +76,9 @@ if CONFIG['MOZ_OPUS']:
if CONFIG['MOZ_WEBM']:
add_tier_dir('platform', 'media/libnestegg')
if CONFIG['MOZ_WEBVTT']:
add_tier_dir('platform', 'media/webvtt')
if CONFIG['MOZ_VP8'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
add_tier_dir('platform', 'media/libvpx')
@ -143,7 +146,6 @@ add_tier_dir('platform', [
'layout',
'docshell',
'embedding',
'media/webvtt',
'xpfe/appshell'
])