diff options
| author | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 07:20:10 +0000 |
|---|---|---|
| committer | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 07:20:10 +0000 |
| commit | 6c9463c58d37922dbd8c47c535f76f72cf40dc41 (patch) | |
| tree | 92a22d0a0345ba6dcbab428c39613acdf692f2e2 /webkit | |
| parent | 9e008aff45ca1883f033a734617b745bbb50a6a9 (diff) | |
| download | chromium_src-6c9463c58d37922dbd8c47c535f76f72cf40dc41.zip chromium_src-6c9463c58d37922dbd8c47c535f76f72cf40dc41.tar.gz chromium_src-6c9463c58d37922dbd8c47c535f76f72cf40dc41.tar.bz2 | |
Revert 174311
Windows build is failing around libvpx after this patch:
http://build.chromium.org/p/chromium/builders/Win/builds/14332
[1220/203018 : error : decomposer.cc(2186)] Block collision for function at 46813200(1536) with ..\..\build\Release\obj\global_intermediate\third_party\libvpx\vp9_subpixel_mmx.obj
> Add wrapper class to media for support of VP9 video, and add a command line flag to enable the support.
>
> This initial version of the wrapper provides support for decoding VP9 video in WebM container files, and is disabled by default.
>
> New flag added: --enable-vp9-playback
>
> BUG=166094
> TEST=VP9 video in WebM containers plays back in <video> elements when --enable-vp9-playback is specified on the command line.
>
>
> Review URL: https://chromiumcodereview.appspot.com/11468018
TBR=tomfinegan@chromium.org
Review URL: https://codereview.chromium.org/11578046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/media/filter_helpers.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc index 6cd0ea9..3500f66 100644 --- a/webkit/media/filter_helpers.cc +++ b/webkit/media/filter_helpers.cc @@ -14,7 +14,6 @@ #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/ffmpeg_video_decoder.h" #include "media/filters/opus_audio_decoder.h" -#include "media/filters/vpx_video_decoder.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "webkit/media/media_stream_client.h" @@ -44,12 +43,6 @@ static void AddDefaultDecodersToCollection( scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder = new media::FFmpegVideoDecoder(message_loop); filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder); - - if (cmd_line->HasSwitch(switches::kEnableVp9Playback)) { - scoped_refptr<media::VpxVideoDecoder> vpx_video_decoder = - new media::VpxVideoDecoder(message_loop); - filter_collection->GetVideoDecoders()->push_back(vpx_video_decoder); - } } bool BuildMediaStreamCollection( |