| Index: webkit/media/filter_helpers.cc
|
| diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
|
| index 379e2caad4a2cf7c31ff5b2cd825a747c2e8fc61..bae12e5a4aa2ab5b6a2549b52ba5158815596e21 100644
|
| --- a/webkit/media/filter_helpers.cc
|
| +++ b/webkit/media/filter_helpers.cc
|
| @@ -13,6 +13,7 @@
|
| #include "media/filters/ffmpeg_audio_decoder.h"
|
| #include "media/filters/ffmpeg_demuxer.h"
|
| #include "media/filters/ffmpeg_video_decoder.h"
|
| +#include "media/filters/libvpx_video_decoder.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
|
| #include "webkit/media/crypto/proxy_decryptor.h"
|
| #include "webkit/media/media_stream_client.h"
|
| @@ -56,6 +57,10 @@ static void AddDefaultDecodersToCollection(
|
| filter_collection->GetVideoDecoders()->push_back(decrypting_video_decoder);
|
| }
|
|
|
| + scoped_refptr<media::LibvpxVideoDecoder> libvpx_video_decoder =
|
| + new media::LibvpxVideoDecoder(message_loop);
|
| + filter_collection->GetVideoDecoders()->push_back(libvpx_video_decoder);
|
| +
|
| scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder =
|
| new media::FFmpegVideoDecoder(message_loop, proxy_decryptor);
|
| filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder);
|
|
|