Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 10:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 941296 - Enable FMP4 when APPLEMEDIA is enabled. r=cpearce,ted

Browse Source 
This requires moving the MOZ_APPLEMEDIA define. I put it in
alphabetical order with the other platform decoder checks.

Also removes the --disable-apple-media configure switch.
We don't have proper testing for these options, so it's
better not to offer the choice.
This commit is contained in:
Ralph Giles 2014-07-09 15:25:00 -07:00
parent e4b57f2456
commit 73b7a51a2a
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
configure.in
View File

@ -5082,6 +5082,20 @@ if test -n "$MOZ_WEBM"; then
MOZ_VPX=1
fi;
dnl ========================================================
dnl = Apple platform decoder support
dnl ========================================================
if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
MOZ_APPLEMEDIA=1
fi
if test -n "$MOZ_APPLEMEDIA"; then
AC_DEFINE(MOZ_APPLEMEDIA)
# hack in frameworks for fmp4 - see bug 1029974
# We load VideoToolbox and CoreMedia dynamically, so they don't appear here.
LDFLAGS="$LDFLAGS -framework AudioToolbox"
fi
dnl ========================================================
dnl = DirectShow support
dnl ========================================================
@ -5142,10 +5156,8 @@ fi;
dnl ========================================================
dnl = Built-in fragmented MP4 support.
dnl ========================================================
if test -n "$MOZ_WMF" -o -n "$MOZ_FFMPEG"; then
dnl Enable fragmented MP4 parser on Windows by default.
dnl We will also need to enable it on other platforms as we implement
dnl platform decoder support there too.
if test -n "$MOZ_WMF" -o -n "$MOZ_FFMPEG" -o -n "$MOZ_APPLEMEDIA"; then
dnl Enable fragmented MP4 parser on platforms with decoder support.
MOZ_FMP4=1
fi
@ -5188,22 +5200,6 @@ if test -n "$MOZ_ANDROID_OMX"; then
AC_DEFINE(MOZ_ANDROID_OMX)
fi
dnl ========================================================
dnl = Disable platform MP3 decoder on OSX
dnl ========================================================
if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
MOZ_APPLEMEDIA=1
fi
MOZ_ARG_DISABLE_BOOL(apple-media,
[ --disable-apple-media Disable support for Apple AudioToolbox/VideoToolbox],
MOZ_APPLEMEDIA=,
MOZ_APPLEMEDIA=1)
if test -n "$MOZ_APPLEMEDIA"; then
AC_DEFINE(MOZ_APPLEMEDIA)
fi
dnl ========================================================
dnl = Enable getUserMedia support
dnl ========================================================