diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /webkit/glue/webmediaplayer_impl.cc | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index d5c667d..e4aca5a 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -244,7 +244,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client, // Add in the default filter factories. filter_factory_->AddFactory(media::FFmpegDemuxer::CreateFilterFactory()); filter_factory_->AddFactory(media::FFmpegAudioDecoder::CreateFactory()); - filter_factory_->AddFactory(media::FFmpegVideoDecoder::CreateFactory()); + filter_factory_->AddFactory(media::FFmpegVideoDecoder::CreateFactory(NULL)); filter_factory_->AddFactory(media::NullAudioRenderer::CreateFilterFactory()); filter_factory_->AddFactory(video_renderer_factory->CreateFactory(proxy_)); } |