Index: webkit/media/webmediaplayer_impl.cc |
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc |
index ce2cbc7c78b80aec988fe38ac667cdf0204f7347..20d367861eef078bd52fcdeecf34327afd054cac 100644 |
--- a/webkit/media/webmediaplayer_impl.cc |
+++ b/webkit/media/webmediaplayer_impl.cc |
@@ -1303,18 +1303,19 @@ WebMediaPlayerImpl::BuildFilterCollection() { |
media_thread_.message_loop_proxy(), gpu_factories_)); |
} |
- video_decoders.push_back(new media::FFmpegVideoDecoder( |
- media_thread_.message_loop_proxy())); |
- |
// TODO(phajdan.jr): Remove ifdefs when libvpx with vp9 support is released |
// (http://crbug.com/174287) . |
#if !defined(MEDIA_DISABLE_LIBVPX) |
- if (cmd_line->HasSwitch(switches::kEnableVp9Playback)) { |
+ if (cmd_line->HasSwitch(switches::kEnableVp9Playback) || |
+ cmd_line->HasSwitch(switches::kEnableVp8AlphaPlayback)) { |
video_decoders.push_back(new media::VpxVideoDecoder( |
media_thread_.message_loop_proxy())); |
} |
#endif // !defined(MEDIA_DISABLE_LIBVPX) |
+ video_decoders.push_back(new media::FFmpegVideoDecoder( |
+ media_thread_.message_loop_proxy())); |
+ |
scoped_ptr<media::VideoRenderer> video_renderer( |
new media::VideoRendererBase( |
media_thread_.message_loop_proxy(), |