equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e4b87e710b1a5f0bb7db058911bc163b4bf30227 |
2 # Parent b6b96c933ed1acd86ee0201165f696a8c2ebd8eb |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
4 No Bug - use GStreamer _only_ for MP4 (not WebM/OGG) |
4 No Bug - use GStreamer _only_ for MP4 (not WebM/OGG) |
5 |
5 |
6 diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp |
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 |
7 --- a/content/html/content/src/nsHTMLMediaElement.cpp |
8 +++ b/content/html/content/src/nsHTMLMediaElement.cpp |
8 +++ b/content/html/content/src/nsHTMLMediaElement.cpp |
9 @@ -2277,21 +2277,17 @@ nsHTMLMediaElement::CreateDecoder(const |
9 @@ -2437,21 +2437,17 @@ nsHTMLMediaElement::CreateDecoder(const |
10 nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder(); |
10 nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder(); |
11 if (decoder->Init(this)) { |
11 if (decoder->Init(this)) { |
12 return decoder.forget(); |
12 return decoder.forget(); |
13 } |
13 } |
14 } |
14 } |
26 } |
26 } |
27 #endif |
27 #endif |
28 #ifdef MOZ_WAVE |
28 #ifdef MOZ_WAVE |
29 if (IsWaveType(aType)) { |
29 if (IsWaveType(aType)) { |
30 nsRefPtr<nsWaveDecoder> decoder = new nsWaveDecoder(); |
30 nsRefPtr<nsWaveDecoder> decoder = new nsWaveDecoder(); |
31 @@ -2305,21 +2301,17 @@ nsHTMLMediaElement::CreateDecoder(const |
31 @@ -2473,21 +2469,17 @@ nsHTMLMediaElement::CreateDecoder(const |
32 nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType); |
32 nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType); |
33 if (decoder->Init(this)) { |
33 if (decoder->Init(this)) { |
34 return decoder.forget(); |
34 return decoder.forget(); |
35 } |
35 } |
36 } |
36 } |
46 return decoder.forget(); |
46 return decoder.forget(); |
47 } |
47 } |
48 } |
48 } |
49 #endif |
49 #endif |
50 |
50 |
51 #ifdef MOZ_GSTREAMER |
51 #ifdef MOZ_DASH |
52 if (IsH264Type(aType)) { |
52 if (IsDASHMPDType(aType)) { |