Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2020-12-26 07:05:51 +08:00
commit 73279b4a8d

View file

@ -441,6 +441,7 @@ static const nsDefaultMimeTypeEntry defaultMimeEntries[] =
{ APPLICATION_PDF, "pdf" },
{ VIDEO_WEBM, "webm" },
{ AUDIO_WEBM, "webm" },
{ AUDIO_FLAC, "flac" },
#if defined(MOZ_WMF)
{ VIDEO_MP4, "mp4" },
{ AUDIO_MP4, "m4a" },