mozilla-inbound: changeset 249129:a6bab13aa2302041d1a25a4bf7eb99e617a6e461

author	Blake Wu <bwu@mozilla.com>
	Mon, 15 Jun 2015 21:20:30 +0800
changeset 249129	a6bab13aa2302041d1a25a4bf7eb99e617a6e461
parent 249128	5fba93205745547f5401541b9cfdfc1b74f03a09
child 249130	4b827038a8c57174428c6ca3d2a0ea899cebc0a3
push id	61149
push user	ryanvm@gmail.com
push date	Tue, 16 Jun 2015 18:48:55 +0000
treeherder	mozilla-inbound@4f381552336d [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	sotaro
bugs	1174623
milestone	41.0a1
first release with	nightly linux32 d7c148c84594 / 41.0a1 / 20150617030205 / files nightly linux64 d7c148c84594 / 41.0a1 / 20150617030205 / files nightly mac d7c148c84594 / 41.0a1 / 20150617030205 / files nightly win32 d7c148c84594 / 41.0a1 / 20150617030205 / files nightly win64 d7c148c84594 / 41.0a1 / 20150617030205 / files
last release without	nightly linux32 ce863f9d8864 / 41.0a1 / 20150616030201 / files nightly linux64 ce863f9d8864 / 41.0a1 / 20150616030201 / files nightly mac ce863f9d8864 / 41.0a1 / 20150616030201 / files nightly win32 ce863f9d8864 / 41.0a1 / 20150616030201 / files nightly win64 ce863f9d8864 / 41.0a1 / 20150616030201 / files

--- a/dom/media/platforms/gonk/GonkDecoderModule.cpp
+++ b/dom/media/platforms/gonk/GonkDecoderModule.cpp
@@ -61,14 +61,15 @@ GonkDecoderModule::DecoderNeedsConversio
 }
 
 bool
 GonkDecoderModule::SupportsMimeType(const nsACString& aMimeType)
 {
   return aMimeType.EqualsLiteral("audio/mp4a-latm") ||
     aMimeType.EqualsLiteral("audio/3gpp") ||
     aMimeType.EqualsLiteral("audio/amr-wb") ||
+    aMimeType.EqualsLiteral("audio/mpeg") ||
     aMimeType.EqualsLiteral("video/mp4") ||
     aMimeType.EqualsLiteral("video/mp4v-es") ||
     aMimeType.EqualsLiteral("video/avc") ||
     aMimeType.EqualsLiteral("video/3gpp");
 }
 } // namespace mozilla