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

Bug 1111033 - Disable EME if FMP4 is disabled, r=glandium

Browse Source
This commit is contained in:
Michael Wu 2014-12-16 20:56:09 -05:00
parent 90f31ccf52
commit 11cb060136
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@ -3856,7 +3856,6 @@ if test -n "$MOZ_FMP4"; then
else else
MOZ_FMP4= MOZ_FMP4=
fi fi
MOZ_EME=1
MOZ_FFMPEG= MOZ_FFMPEG=
MOZ_WEBRTC=1 MOZ_WEBRTC=1
MOZ_PEERCONNECTION= MOZ_PEERCONNECTION=
@ -5327,6 +5326,7 @@ MOZ_ARG_DISABLE_BOOL(fmp4,
if test -n "$MOZ_FMP4"; then if test -n "$MOZ_FMP4"; then
AC_DEFINE(MOZ_FMP4) AC_DEFINE(MOZ_FMP4)
MOZ_EME=1
fi; fi;
dnl ======================================================== dnl ========================================================
@ -5339,6 +5339,9 @@ MOZ_ARG_DISABLE_BOOL(eme,
MOZ_EME=1) MOZ_EME=1)
if test -n "$MOZ_EME"; then if test -n "$MOZ_EME"; then
if test -z "$MOZ_FMP4"; then
AC_MSG_ERROR([Encrypted Media Extension support requires Fragmented MP4 support])
fi
AC_DEFINE(MOZ_EME) AC_DEFINE(MOZ_EME)
fi; fi;