summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authordamienv <damienv@chromium.org>2014-08-26 18:47:58 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-27 01:48:37 +0000
commita6c976378bd6485a520f0806e82126b25047d1c9 (patch)
tree24e4b9724f95ea4a72dffc2ab7d6ef2e9e86b4cf /build
parent29fe338316a08c2669d2e011889dff2b91dfb616 (diff)
downloadchromium_src-a6c976378bd6485a520f0806e82126b25047d1c9.zip
chromium_src-a6c976378bd6485a520f0806e82126b25047d1c9.tar.gz
chromium_src-a6c976378bd6485a520f0806e82126b25047d1c9.tar.bz2
Add the mp2t mimetype to the list of supported mime types.
The mp2t mimetype is now supported when the mpeg2 TS stream parser is enabled. This change is required since isTypeSupported involves that CanPlayType for the same mime type is at least maybe. This condition is now enforced at Blink level. BUG=None Review URL: https://codereview.chromium.org/478043005 Cr-Commit-Position: refs/heads/master@{#292073}
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi5
1 files changed, 5 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 531339f..eae50bf 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2590,6 +2590,11 @@
}],
['proprietary_codecs==1', {
'defines': ['USE_PROPRIETARY_CODECS'],
+ 'conditions': [
+ ['enable_mpeg2ts_stream_parser==1', {
+ 'defines': ['ENABLE_MPEG2TS_STREAM_PARSER'],
+ }],
+ ],
}],
['enable_viewport==1', {
'defines': ['ENABLE_VIEWPORT'],