summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-02 23:55:44 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-02 23:55:44 +0000
commit720ac73783ea732c130ff6d11dffa41919a25809 (patch)
tree02c4777153a46f0ab78a2b0134d07f4d0d27558d /chrome/renderer
parentc24e5d031e408a81cd6a004353b4d3065d29046d (diff)
downloadchromium_src-720ac73783ea732c130ff6d11dffa41919a25809.zip
chromium_src-720ac73783ea732c130ff6d11dffa41919a25809.tar.gz
chromium_src-720ac73783ea732c130ff6d11dffa41919a25809.tar.bz2
FFmpeg video decoder glue code
Implementation of FFmpeg to perform video decoding. Also added hooks to insert this FFmpeg video decoder filter. Review URL: http://codereview.chromium.org/60069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13056 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/webmediaplayer_delegate_impl.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/renderer/webmediaplayer_delegate_impl.cc b/chrome/renderer/webmediaplayer_delegate_impl.cc
index 04e992b..6c30e25 100644
--- a/chrome/renderer/webmediaplayer_delegate_impl.cc
+++ b/chrome/renderer/webmediaplayer_delegate_impl.cc
@@ -12,6 +12,7 @@
// FFmpeg is not ready for Linux and Mac yet.
#include "media/filters/ffmpeg_audio_decoder.h"
#include "media/filters/ffmpeg_demuxer.h"
+#include "media/filters/ffmpeg_video_decoder.h"
#endif
/////////////////////////////////////////////////////////////////////////////
@@ -61,6 +62,7 @@ WebMediaPlayerDelegateImpl::WebMediaPlayerDelegateImpl(RenderView* view)
// FFmpeg is not ready for Linux and Mac yet.
filter_factory_->AddFactory(media::FFmpegDemuxer::CreateFilterFactory());
filter_factory_->AddFactory(media::FFmpegAudioDecoder::CreateFactory());
+ filter_factory_->AddFactory(media::FFmpegVideoDecoder::CreateFactory());
#endif
filter_factory_->AddFactory(AudioRendererImpl::CreateFactory(this));
filter_factory_->AddFactory(VideoRendererImpl::CreateFactory(this));