diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-10-31 05:47:20 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-10-31 05:47:20 +0800 |
| commit | cc14face872357861b39c7e1e3728a1e54e73a05 (patch) | |
| tree | 74717dfb5fc9567d091d08c66dbfca8aaf3150f3 /www | |
| parent | b6284437d4423640e6f289fda56d255491fd7b1d (diff) | |
| download | freebsd-ports-gnome-cc14face872357861b39c7e1e3728a1e54e73a05.tar.gz freebsd-ports-gnome-cc14face872357861b39c7e1e3728a1e54e73a05.tar.zst freebsd-ports-gnome-cc14face872357861b39c7e1e3728a1e54e73a05.zip | |
gecko: better detect FLAC after r453085
MFH: 2017Q4
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox-esr/files/patch-bug1412558 | 20 | ||||
| -rw-r--r-- | www/firefox/files/patch-bug1412558 | 20 | ||||
| -rw-r--r-- | www/seamonkey/files/patch-bug1412558 | 20 |
3 files changed, 45 insertions, 15 deletions
diff --git a/www/firefox-esr/files/patch-bug1412558 b/www/firefox-esr/files/patch-bug1412558 index ffa49490caf6..b6d3b045eae5 100644 --- a/www/firefox-esr/files/patch-bug1412558 +++ b/www/firefox-esr/files/patch-bug1412558 @@ -2,15 +2,25 @@ 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 -@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine() - /* static */ bool - FlacDecoder::IsEnabled() +@@ -7,6 +7,7 @@ + #include "FlacDecoder.h" + #include "MediaContainerType.h" + #include "MediaPrefs.h" ++#include "PDMFactory.h" + + namespace mozilla { + +@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() { --#ifdef MOZ_FFVPX -+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX) + #ifdef MOZ_FFVPX return MediaPrefs::FlacEnabled(); ++#elif defined(MOZ_FFMPEG) ++ RefPtr<PDMFactory> platform = new PDMFactory(); ++ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), ++ /* DecoderDoctorDiagnostics* */ nullptr); #else // Until bug 1295886 is fixed. + return false; diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA index 5d3a6037efe0..43144b726a92 100644 --- media/ffvpx/README_MOZILLA diff --git a/www/firefox/files/patch-bug1412558 b/www/firefox/files/patch-bug1412558 index ffa49490caf6..b6d3b045eae5 100644 --- a/www/firefox/files/patch-bug1412558 +++ b/www/firefox/files/patch-bug1412558 @@ -2,15 +2,25 @@ 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 -@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine() - /* static */ bool - FlacDecoder::IsEnabled() +@@ -7,6 +7,7 @@ + #include "FlacDecoder.h" + #include "MediaContainerType.h" + #include "MediaPrefs.h" ++#include "PDMFactory.h" + + namespace mozilla { + +@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() { --#ifdef MOZ_FFVPX -+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX) + #ifdef MOZ_FFVPX return MediaPrefs::FlacEnabled(); ++#elif defined(MOZ_FFMPEG) ++ RefPtr<PDMFactory> platform = new PDMFactory(); ++ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), ++ /* DecoderDoctorDiagnostics* */ nullptr); #else // Until bug 1295886 is fixed. + return false; diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA index 5d3a6037efe0..43144b726a92 100644 --- media/ffvpx/README_MOZILLA diff --git a/www/seamonkey/files/patch-bug1412558 b/www/seamonkey/files/patch-bug1412558 index bf693800fa48..536162ba6edf 100644 --- a/www/seamonkey/files/patch-bug1412558 +++ b/www/seamonkey/files/patch-bug1412558 @@ -2,15 +2,25 @@ diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp index 53fc3c9937f7..b23771ab80fa 100644 --- mozilla/dom/media/flac/FlacDecoder.cpp +++ mozilla/dom/media/flac/FlacDecoder.cpp -@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine() - /* static */ bool - FlacDecoder::IsEnabled() +@@ -7,6 +7,7 @@ + #include "FlacDecoder.h" + #include "MediaContainerType.h" + #include "MediaPrefs.h" ++#include "PDMFactory.h" + + namespace mozilla { + +@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() { --#ifdef MOZ_FFVPX -+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX) + #ifdef MOZ_FFVPX return MediaPrefs::FlacEnabled(); ++#elif defined(MOZ_FFMPEG) ++ RefPtr<PDMFactory> platform = new PDMFactory(); ++ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), ++ /* DecoderDoctorDiagnostics* */ nullptr); #else // Until bug 1295886 is fixed. + return false; diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA index 5d3a6037efe0..43144b726a92 100644 --- mozilla/media/ffvpx/README_MOZILLA |