diff options
| author | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 00:50:54 +0000 |
|---|---|---|
| committer | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 00:50:54 +0000 |
| commit | b150b553cd0e97b649e94f11fd5c1d4b092327f2 (patch) | |
| tree | f8b4b6b955eee04abb06438039d32c20837cef2f /webkit/renderer | |
| parent | 3e001dce773fd9252e0ccffe11ef8fb43bdf1922 (diff) | |
| download | chromium_src-b150b553cd0e97b649e94f11fd5c1d4b092327f2.zip chromium_src-b150b553cd0e97b649e94f11fd5c1d4b092327f2.tar.gz chromium_src-b150b553cd0e97b649e94f11fd5c1d4b092327f2.tar.bz2 | |
media: Remove VP9 flag, and enable VP9 support by default.
BUG=180280
TEST=VP9 pipeline integration tests pass
Review URL: https://chromiumcodereview.appspot.com/16830004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206530 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/renderer')
| -rw-r--r-- | webkit/renderer/media/webmediaplayer_impl.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/webkit/renderer/media/webmediaplayer_impl.cc b/webkit/renderer/media/webmediaplayer_impl.cc index 0ff86fb..a6aaa5a 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_)); #endif // !defined(MEDIA_DISABLE_LIBVPX) video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_)); |