diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 21:06:11 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 21:06:11 +0000 |
| commit | fbdafd7422d158458b48308f0552f4f548712adc (patch) | |
| tree | 75105382501f0859e9836c2b97139a30d074370f | |
| parent | c5d463ec9cf8eda310e0992b7bb30e9041dfa2b0 (diff) | |
| download | chromium_src-fbdafd7422d158458b48308f0552f4f548712adc.zip chromium_src-fbdafd7422d158458b48308f0552f4f548712adc.tar.gz chromium_src-fbdafd7422d158458b48308f0552f4f548712adc.tar.bz2 | |
Adding support of ogg/vorbis audio for android
Android should support ogg/vorbis audio, not ogg/theora video
BUG=
TEST=
Review URL: http://codereview.chromium.org/9361067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126993 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/base/mime_util.cc | 4 | ||||
| -rw-r--r-- | net/net.gyp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index c7967fe..f9e72a4 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -228,11 +228,11 @@ 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", +#if defined(ENABLE_MEDIA_CODEC_THEORA) + "video/ogg", #endif // WebM. diff --git a/net/net.gyp b/net/net.gyp index d09a5fc..454676c 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -980,7 +980,6 @@ 'defines': [ # These are the features Android doesn't support. 'ENABLE_MEDIA_CODEC_THEORA', - 'ENABLE_MEDIA_TYPE_OGG', ], }, ], |