a07c15747d
- Drop DTRACE option, as it no longer builds https://bugzilla.mozilla.org/show_bug.cgi?id=1448659 https://bugzilla.mozilla.org/show_bug.cgi?id=702179#c33 - Stop using system hunspell per https://bugzilla.mozilla.org/show_bug.cgi?id=1460600 Changes: https://www.mozilla.org/firefox/61.0/releasenotes/ PR: 227850 Security: cd81806c-26e7-4d4a-8425-02724a2f48af MFH: 2018Q2 Differential Revision: https://reviews.freebsd.org/D15227
25 lines
825 B
C++
25 lines
825 B
C++
Enable FLAC on platforms without ffvpx like powerpc*
|
|
|
|
diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
|
|
index 53fc3c9937f7..b23771ab80fa 100644
|
|
--- dom/media/flac/FlacDecoder.cpp
|
|
+++ dom/media/flac/FlacDecoder.cpp
|
|
@@ -7,6 +7,7 @@
|
|
#include "FlacDecoder.h"
|
|
#include "MediaContainerType.h"
|
|
#include "mozilla/StaticPrefs.h"
|
|
+#include "PDMFactory.h"
|
|
|
|
namespace mozilla {
|
|
|
|
@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
|
|
{
|
|
#ifdef MOZ_FFVPX
|
|
return StaticPrefs::MediaFlacEnabled();
|
|
+#elif defined(MOZ_FFMPEG)
|
|
+ RefPtr<PDMFactory> platform = new PDMFactory();
|
|
+ return StaticPrefs::MediaFlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
|
|
+ /* DecoderDoctorDiagnostics* */ nullptr);
|
|
#else
|
|
// Until bug 1295886 is fixed.
|
|
return false;
|