# 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)) {