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

Unified Diff: media/filters/stream_parser_factory.cc

Issue 23468032: Merge 221405 "Disable VP9 for Android" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1599/src/
Patch Set: Created 7 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/stream_parser_factory.cc
===================================================================
--- media/filters/stream_parser_factory.cc (revision 223056)
+++ media/filters/stream_parser_factory.cc (working copy)
@@ -65,7 +65,11 @@
static const CodecInfo* kVideoWebMCodecs[] = {
&kVP8CodecInfo,
+#if !defined(OS_ANDROID)
+ // TODO(wonsik): crbug.com/285016 query Android platform for codec
+ // capabilities.
&kVP9CodecInfo,
+#endif
&kVorbisCodecInfo,
NULL
};
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698