diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 22:47:57 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 22:47:57 +0000 |
| commit | d2effadd83accd3df875694437ca766bb20cb6e1 (patch) | |
| tree | 4ae89de7105c1850bdeac35d870fcc6e1d015e1b /net/base/mime_util.cc | |
| parent | 734a36e98b8bb2dded95c0b7e4e35e82bb3f5507 (diff) | |
| download | chromium_src-d2effadd83accd3df875694437ca766bb20cb6e1.zip chromium_src-d2effadd83accd3df875694437ca766bb20cb6e1.tar.gz chromium_src-d2effadd83accd3df875694437ca766bb20cb6e1.tar.bz2 | |
Upstream android net related code (part3)
Moved from http://codereview.chromium.org/7277057/
BUG=
TEST=
Review URL: http://codereview.chromium.org/7328025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92069 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/mime_util.cc')
| -rw-r--r-- | net/base/mime_util.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 75572a9..4dad7ad 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -227,10 +227,14 @@ static const char* const supported_image_types[] = { // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php static const char* const supported_media_types[] = { +#if defined(ENABLE_MEDIA_TYPE_OGG) // Ogg. "video/ogg", "audio/ogg", "application/ogg", +#endif + + // WebM. "video/webm", "audio/webm", "audio/wav", @@ -259,7 +263,9 @@ static const char* const supported_media_codecs[] = { "avc1", "mp4a", #endif +#if defined(ENABLE_MEDIA_CODEC_THEORA) "theora", +#endif "vorbis", "vp8", "1" // PCM for WAV. |