forked from pool/MozillaFirefox
6f2059ff99
- requires NSPR 4.9.2 - improve GStreamer integration (bmo#760140) - removed upstreamed mozilla-crashreporter-restart-args.patch - webapprt now included - use kmozillahelper's new REVEAL command (bnc#777415) (requires mozilla-kde4-integration >= 0.6.4) - updated translations-other with new languages OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=295
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
# HG changeset patch
|
|
# Parent e4b87e710b1a5f0bb7db058911bc163b4bf30227
|
|
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
|
No Bug - use GStreamer _only_ for MP4 (not WebM/OGG)
|
|
|
|
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
|
|
--- a/content/html/content/src/nsHTMLMediaElement.cpp
|
|
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
|
|
@@ -2277,21 +2277,17 @@ nsHTMLMediaElement::CreateDecoder(const
|
|
nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder();
|
|
if (decoder->Init(this)) {
|
|
return decoder.forget();
|
|
}
|
|
}
|
|
#endif
|
|
#ifdef MOZ_OGG
|
|
if (IsOggType(aType)) {
|
|
-#ifdef MOZ_GSTREAMER
|
|
- nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder();
|
|
-#else
|
|
nsRefPtr<nsOggDecoder> decoder = new nsOggDecoder();
|
|
-#endif
|
|
if (decoder->Init(this)) {
|
|
return decoder.forget();
|
|
}
|
|
}
|
|
#endif
|
|
#ifdef MOZ_WAVE
|
|
if (IsWaveType(aType)) {
|
|
nsRefPtr<nsWaveDecoder> decoder = new nsWaveDecoder();
|
|
@@ -2305,21 +2301,17 @@ nsHTMLMediaElement::CreateDecoder(const
|
|
nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType);
|
|
if (decoder->Init(this)) {
|
|
return decoder.forget();
|
|
}
|
|
}
|
|
#endif
|
|
#ifdef MOZ_WEBM
|
|
if (IsWebMType(aType)) {
|
|
-#ifdef MOZ_GSTREAMER
|
|
- nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder();
|
|
-#else
|
|
nsRefPtr<nsWebMDecoder> decoder = new nsWebMDecoder();
|
|
-#endif
|
|
if (decoder->Init(this)) {
|
|
return decoder.forget();
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#ifdef MOZ_GSTREAMER
|
|
if (IsH264Type(aType)) {
|