summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-07 03:45:49 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-07 03:45:49 +0000
commite8b80d819b7d1888e10f5cfef75bfeff0f5d3b03 (patch)
treecd2a45d43b36c66842806e91362c257c4907fc06
parent02d6be5f104727eb713729925a48f884ecaf4188 (diff)
downloadchromium_src-e8b80d819b7d1888e10f5cfef75bfeff0f5d3b03.zip
chromium_src-e8b80d819b7d1888e10f5cfef75bfeff0f5d3b03.tar.gz
chromium_src-e8b80d819b7d1888e10f5cfef75bfeff0f5d3b03.tar.bz2
Add mpeg for layouttests to pass. The following media layout tests fail if mpeg (ie mpg) is not supported.
LayoutTests/media/video-source-add-src.html = FAIL LayoutTests/media/video-source-error.html = FAIL LayoutTests/media/video-source-type-params.html = FAIL LayoutTests/media/video-source-type.html = FAIL Review URL: http://codereview.chromium.org/149241 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20011 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/base/mime_util.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index 0113e3d..85de4a9 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -190,6 +190,11 @@ static const char* const supported_media_types[] = {
// MP3.
"audio/mp3",
"audio/x-mp3",
+
+ // Generic MPEG mime-types.
+ // TODO(fbarchard): Remove these when layout tests stop using mpg.
+ "audio/mpeg",
+ "video/mpeg"
};
// Note: does not include javascript types list (see supported_javascript_types)