Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Unified Diff: webkit/media/filter_helpers.cc

Issue 11953017: Revert 177842. This doesn't build in standalone webkit builds: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/filter_helpers.cc
===================================================================
--- webkit/media/filter_helpers.cc (revision 177952)
+++ webkit/media/filter_helpers.cc (working copy)
@@ -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/Platform/chromium/public/WebURL.h"
#include "webkit/media/media_stream_client.h"
@@ -44,12 +43,6 @@
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(
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698