8a4fb783e988dabe69eb4d3260eb7f44500dee02 - chromium/src

commit	8a4fb783e988dabe69eb4d3260eb7f44500dee02	[log] [tgz]
author	Matt Wolenetz <wolenetz@chromium.org>	Thu Dec 01 20:40:50 2016
committer	Matt Wolenetz <wolenetz@chromium.org>	Thu Dec 01 20:44:07 2016
tree	2f7abaf997f520de045bb3fd114d97274cee980d
parent	a76943e15311ba010af0dec0df9b6c79e5532989 [diff]

To M56: Fix mimetype mappings for FLAC support.

FLAC support landed with the ffmpeg update in M56, we should
ensure our mimetypes are correct in this case.

Patch from servolk@ https://codereview.chromium.org/2362193003

BUG=93887

Review-Url: https://codereview.chromium.org/2515553002
Cr-Commit-Position: refs/heads/master@{#433125}
(cherry picked from commit 97bfa47d1fc314ca4ce969d941d142749880268f)

TBR=dalecurtis@chromium.org,servolk@chromium.org,ddorwin@chromium.org

Review URL: https://codereview.chromium.org/2550473002 .

Cr-Commit-Position: refs/branch-heads/2924@{#260}
Cr-Branched-From: 3a87aecc31cd1ffe751dd72c04e5a96a1fc8108a-refs/heads/master@{#433059}

content/browser/media/media_browsertest.cc[diff]
content/browser/media/media_canplaytype_browsertest.cc[diff]
media/base/demuxer_perftest.cc[diff]
media/base/mime_util_internal.cc[diff]
media/base/mime_util_internal.h[diff]
media/base/mime_util_unittest.cc[diff]
media/filters/audio_decoder_unittest.cc[diff]
media/filters/ffmpeg_demuxer_unittest.cc[diff]
media/test/pipeline_integration_test.cc[diff]

9 files changed