1 # HG changeset patch

     2 # Parent b6b96c933ed1acd86ee0201165f696a8c2ebd8eb

     3 # User Wolfgang Rosenauer <wr@rosenauer.org>

     4 No Bug - use GStreamer _only_ for MP4 (not WebM/OGG)

     5 

     6 diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp

     7 --- a/content/html/content/src/nsHTMLMediaElement.cpp

     8 +++ b/content/html/content/src/nsHTMLMediaElement.cpp

     9 @@ -2437,21 +2437,17 @@ nsHTMLMediaElement::CreateDecoder(const 

    10      nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder();

    11      if (decoder->Init(this)) {

    12        return decoder.forget();

    13      }

    14    }

    15  #endif

    16  #ifdef MOZ_OGG

    17    if (IsOggType(aType)) {

    18 -#ifdef MOZ_GSTREAMER 

    19 -    nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder();

    20 -#else

    21      nsRefPtr<nsOggDecoder> decoder = new nsOggDecoder();

    22 -#endif

    23      if (decoder->Init(this)) {

    24        return decoder.forget();

    25      }

    26    }

    27  #endif

    28  #ifdef MOZ_WAVE

    29    if (IsWaveType(aType)) {

    30      nsRefPtr<nsWaveDecoder> decoder = new nsWaveDecoder();

    31 @@ -2473,21 +2469,17 @@ nsHTMLMediaElement::CreateDecoder(const 

    32      nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType);

    33      if (decoder->Init(this)) {

    34        return decoder.forget();

    35      }

    36    }

    37  #endif

    38  #ifdef MOZ_WEBM

    39    if (IsWebMType(aType)) {

    40 -#ifdef MOZ_GSTREAMER 

    41 -    nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder();

    42 -#else

    43      nsRefPtr<nsWebMDecoder> decoder = new nsWebMDecoder();

    44 -#endif

    45      if (decoder->Init(this)) {

    46        return decoder.forget();

    47      }

    48    }

    49  #endif

    50  

    51  #ifdef MOZ_DASH

    52    if (IsDASHMPDType(aType)) {