diff options
| author | jiesun@google.com <jiesun@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 15:58:03 +0000 |
|---|---|---|
| committer | jiesun@google.com <jiesun@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 15:58:03 +0000 |
| commit | 0ec4fc67805ecdbb955aa05ae329636f1699d5e5 (patch) | |
| tree | f193f591c5756816e3a199798eab4de082f2f58a /webkit/glue | |
| parent | aa76291e87830a539616513bf9edf8aacb856ac9 (diff) | |
| download | chromium_src-0ec4fc67805ecdbb955aa05ae329636f1699d5e5.zip chromium_src-0ec4fc67805ecdbb955aa05ae329636f1699d5e5.tar.gz chromium_src-0ec4fc67805ecdbb955aa05ae329636f1699d5e5.tar.bz2 | |
remove omx from win and mac build.
TEST=try-bot
BUG=45601
Review URL: http://codereview.chromium.org/2870006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index 56067df..78a525c 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -13,7 +13,6 @@ #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/ffmpeg_video_decoder.h" #include "media/filters/null_audio_renderer.h" -#include "media/filters/omx_video_decoder.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/WebKit/chromium/public/WebSize.h" @@ -228,10 +227,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client, // Add in the default filter factories. filter_factory_->AddFactory(media::FFmpegDemuxer::CreateFilterFactory()); filter_factory_->AddFactory(media::FFmpegAudioDecoder::CreateFactory()); - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableOpenMax)) { - filter_factory_->AddFactory(media::OmxVideoDecoder::CreateFactory()); - } filter_factory_->AddFactory(media::FFmpegVideoDecoder::CreateFactory()); filter_factory_->AddFactory(media::NullAudioRenderer::CreateFilterFactory()); filter_factory_->AddFactory(video_renderer_factory->CreateFactory(proxy_)); |