Backout e655c9d59704 Bug 809186 until we decide that we really want this.

This commit is contained in:
Dave Hylands 2012-11-08 21:50:08 -08:00
parent b8fa44f95c
commit d548b36eff
3 changed files with 2 additions and 4 deletions

View File

@ -317,7 +317,7 @@ public:
#ifdef MOZ_WIDGET_GONK
static bool IsOmxEnabled();
static bool IsOmxSupportedType(const nsACString& aType);
static const char gOmxTypes[6][16];
static const char gOmxTypes[5][16];
#endif
#if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK)

View File

@ -2190,10 +2190,9 @@ nsHTMLMediaElement::IsH264Type(const nsACString& aType)
#endif
#ifdef MOZ_WIDGET_GONK
const char nsHTMLMediaElement::gOmxTypes[6][16] = {
const char nsHTMLMediaElement::gOmxTypes[5][16] = {
"audio/mpeg",
"audio/mp4",
"audio/aac-adts",
"video/mp4",
"video/3gpp",
"video/quicktime",

View File

@ -484,7 +484,6 @@ static nsExtraMimeTypeEntry extraMimeEntries [] =
#endif
#if defined(MOZ_MEDIA_PLUGINS) || defined(MOZ_WIDGET_GONK)
{ AUDIO_MP3, "mp3", "MPEG Audio" },
{ "audio/aac-adts", "aac", "AAC-ADTS Audio"},
#endif
{ VIDEO_MP4, "mp4", "MPEG-4 Video" },
{ VIDEO_RAW, "yuv", "Raw YUV Video" },