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 /net/base/mime_util.cc | |
| 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 'net/base/mime_util.cc')
| -rw-r--r-- | net/base/mime_util.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 219d2ea..500cdba 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -305,6 +305,7 @@ static const char* const common_media_codecs[] = { #endif "vorbis", "vp8", + "vp9", "1" // WAVE_FORMAT_PCM. }; @@ -410,7 +411,7 @@ struct MediaFormatStrict { }; static const MediaFormatStrict format_codec_mappings[] = { - { "video/webm", "vorbis,vp8,vp8.0" }, + { "video/webm", "vorbis,vp8,vp8.0,vp9,vp9.0" }, { "audio/webm", "vorbis" }, { "audio/wav", "1" } }; |