summaryrefslogtreecommitdiffstats
path: root/webkit/media
diff options
context:
space:
mode:
authormek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-16 22:29:31 +0000
committermek@chromium.org <mek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-16 22:29:31 +0000
commitd5825e11bd7457e7c48bc364865a7f1b33ac9fb2 (patch)
tree414e2bbc7c044d64cad9dc5cef7565ebe4b05654 /webkit/media
parent92668ad271d3b81e8076b60dd40744f4c11b0396 (diff)
downloadchromium_src-d5825e11bd7457e7c48bc364865a7f1b33ac9fb2.zip
chromium_src-d5825e11bd7457e7c48bc364865a7f1b33ac9fb2.tar.gz
chromium_src-d5825e11bd7457e7c48bc364865a7f1b33ac9fb2.tar.bz2
Revert 194465 "media: Add support for playback for VP8 Alpha vid..."
Broke linux compilation http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Builder%20%28dbg%29&number=47451 > media: Add support for playback for VP8 Alpha video streams. > > BUG=147355 > TEST=VP8 Alpha video streams play > > Review URL: https://codereview.chromium.org/12263013 > > Patch from Vignesh Venkatasubramanian <vigneshv@chromium.org>. TBR=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/13972014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
-rw-r--r--webkit/media/filter_helpers.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index 00cf121..c803f69 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -36,21 +36,20 @@ static void AddDefaultDecodersToCollection(
const scoped_refptr<base::MessageLoopProxy>& message_loop,
media::FilterCollection* filter_collection) {
+ scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder =
+ new media::FFmpegVideoDecoder(message_loop);
+ filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder);
+
// TODO(phajdan.jr): Remove ifdefs when libvpx with vp9 support is released
// (http://crbug.com/174287) .
#if !defined(MEDIA_DISABLE_LIBVPX)
const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
- if (cmd_line->HasSwitch(switches::kEnableVp9Playback) ||
- cmd_line->HasSwitch(switches::kEnableVp8AlphaPlayback) ) {
+ 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);
}
#endif // !defined(MEDIA_DISABLE_LIBVPX)
-
- scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder =
- new media::FFmpegVideoDecoder(message_loop);
- filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder);
}
void BuildMediaSourceCollection(