File mozilla-disable-ogg.patch of Package MozillaFirefox.629

Overview Repositories Revisions Requests Users Attributes Meta

File mozilla-disable-ogg.patch of Package MozillaFirefox.629

# HG changeset patch
# Parent  266422b668dc7140b8cb4607559ebbf3e61061a9

diff --git a/content/media/DecoderTraits.cpp b/content/media/DecoderTraits.cpp
--- a/content/media/DecoderTraits.cpp
+++ b/content/media/DecoderTraits.cpp
@@ -8,18 +8,20 @@
 #include "MediaDecoder.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "mozilla/Preferences.h"
 
 #ifdef MOZ_MEDIA_PLUGINS
 #include "MediaPluginHost.h"
 #endif
 
+#ifdef MOZ_WEBM
 #include "OggDecoder.h"
 #include "OggReader.h"
+#endif
 #ifdef MOZ_WAVE
 #include "WaveDecoder.h"
 #include "WaveReader.h"
 #endif
 #ifdef MOZ_WEBM
 #include "WebMDecoder.h"
 #include "WebMReader.h"
 #endif
@@ -474,20 +476,22 @@ InstantiateDecoder(const nsACString& aTy
   }
 #endif
 #ifdef MOZ_RAW
   if (IsRawType(aType)) {
     decoder = new RawDecoder();
     return decoder.forget();
   }
 #endif
+#ifdef MOZ_WEBM
   if (IsOggType(aType)) {
     decoder = new OggDecoder();
     return decoder.forget();
   }
+#endif
 #ifdef MOZ_WAVE
   if (IsWaveType(aType)) {
     decoder = new WaveDecoder();
     return decoder.forget();
   }
 #endif
 #ifdef MOZ_OMX_DECODER
   if (IsOmxSupportedType(aType)) {
@@ -582,19 +586,21 @@ MediaDecoderReader* DecoderTraits::Creat
     decoderReader = new GStreamerReader(aDecoder);
   } else
 #endif
 #ifdef MOZ_RAW
   if (IsRawType(aType)) {
     decoderReader = new RawReader(aDecoder);
   } else
 #endif
+#ifdef MOZ_WEBM
   if (IsOggType(aType)) {
     decoderReader = new OggReader(aDecoder);
   } else
+#endif
 #ifdef MOZ_WAVE
   if (IsWaveType(aType)) {
     decoderReader = new WaveReader(aDecoder);
   } else
 #endif
 #ifdef MOZ_OMX_DECODER
   if (IsOmxSupportedType(aType)) {
     decoderReader = new MediaOmxReader(aDecoder);

Places

File mozilla-disable-ogg.patch of Package MozillaFirefox.629

Places