Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / webmediaplayer_impl.cc

diff --git a/src/content/renderer/media/webmediaplayer_impl.cc b/src/content/renderer/media/webmediaplayer_impl.cc
index dbe3924..a055587 100644 (file)
--- a/src/content/renderer/media/webmediaplayer_impl.cc
+++ b/src/content/renderer/media/webmediaplayer_impl.cc
@@ -1152,6 +1152,13 @@ void WebMediaPlayerImpl::StartPipeline() {
         base::Bind(&LogMediaSourceError, media_log_),
         false);
     demuxer_.reset(chunk_demuxer_);
+
+#if !defined(OS_CHROMEOS)
+    // Disable GpuVideoDecoder creation on platforms other than CrOS until
+    // they support codec config changes.
+    // TODO(acolwell): Remove this once http://crbug.com/151045 is fixed.
+    gpu_factories_ = NULL;
+#endif
   }
 
   scoped_ptr<media::FilterCollection> filter_collection(