diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js index e242138bed5b..12f8ed6d0bea 100644 --- a/b2g/app/b2g.js +++ b/b2g/app/b2g.js @@ -49,7 +49,7 @@ pref("network.protocol-handler.warn-external.vnd.youtube", false); // By default, all protocol handlers are exposed. This means that the browser // will response to openURL commands for all URL types. It will also try to open // link clicks inside the browser before failing over to the system handlers. -pref("network.protocol-handler.expose.rtsp", false); +pref("network.protocol-handler.expose.rtsp", true); /* http prefs */ pref("network.http.pipelining", true); diff --git a/content/media/DecoderTraits.cpp b/content/media/DecoderTraits.cpp index ae8d68139d6a..bcf45b5a5a04 100644 --- a/content/media/DecoderTraits.cpp +++ b/content/media/DecoderTraits.cpp @@ -430,6 +430,11 @@ DecoderTraits::CanHandleMediaType(const char* aMIMEType, if (MediaDecoder::IsMediaPluginsEnabled() && GetMediaPluginHost()->FindDecoder(nsDependentCString(aMIMEType), &codecList)) result = CANPLAY_MAYBE; +#endif +#ifdef NECKO_PROTOCOL_rtsp + if (IsRtspSupportedType(nsDependentCString(aMIMEType))) { + result = CANPLAY_MAYBE; + } #endif if (result == CANPLAY_NO || !aHaveRequestedCodecs || !codecList) { return result; @@ -664,6 +669,9 @@ bool DecoderTraits::IsSupportedInVideoDocument(const nsACString& aType) #endif #ifdef MOZ_APPLEMEDIA IsAppleMediaSupportedType(aType) || +#endif +#ifdef NECKO_PROTOCOL_rtsp + IsRtspSupportedType(aType) || #endif false; }