Chromium Code Reviews| Index: webkit/renderer/media/webmediaplayer_impl.cc |
| diff --git a/webkit/renderer/media/webmediaplayer_impl.cc b/webkit/renderer/media/webmediaplayer_impl.cc |
| index 0ff86fb91809cc40ea917b76290601e61d89ef52..a6aaa5a731f8bf34568e95ecec68add3a4ddf53a 100644 |
| --- a/webkit/renderer/media/webmediaplayer_impl.cc |
| +++ b/webkit/renderer/media/webmediaplayer_impl.cc |
| @@ -1078,10 +1078,7 @@ void WebMediaPlayerImpl::StartPipeline(WebKit::WebMediaSource* media_source) { |
| // 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) || |
| - cmd_line->HasSwitch(switches::kEnableVp8AlphaPlayback)) { |
| - video_decoders.push_back(new media::VpxVideoDecoder(media_loop_)); |
| - } |
| + video_decoders.push_back(new media::VpxVideoDecoder(media_loop_)); |
|
scherkus (not reviewing)
2013/06/12 20:06:31
OOC this will still prefer FFmpeg's ffvp8 because
Tom Finegan
2013/06/12 20:35:49
Right, VpxVideoDecoder only accepts VP8 input when
|
| #endif // !defined(MEDIA_DISABLE_LIBVPX) |
| video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_)); |