summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/base/mime_util.cc4
-rw-r--r--net/net.gyp1
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',
],
},
],