2 |
--- chromium-45.0.2454.6/media/base/mime_util.cc.matroska-avi 2015-07-10 21:01:21.000000000 +0200 |
--- chromium-45.0.2454.6/media/base/mime_util.cc.matroska-avi 2015-07-10 21:01:21.000000000 +0200 |
3 |
+++ chromium-45.0.2454.6/media/base/mime_util.cc 2015-07-15 04:06:00.656754887 +0200 |
+++ chromium-45.0.2454.6/media/base/mime_util.cc 2015-07-15 04:06:00.656754887 +0200 |
4 |
@@ -38,7 +38,12 @@ class MimeUtil { |
@@ -38,7 +38,12 @@ class MimeUtil { |
5 |
H264_HIGH, |
HEVC_MAIN, |
6 |
VP8, |
VP8, |
7 |
VP9, |
VP9, |
8 |
- THEORA |
- THEORA |
16 |
|
|
17 |
bool IsSupportedMediaMimeType(const std::string& mime_type) const; |
bool IsSupportedMediaMimeType(const std::string& mime_type) const; |
18 |
@@ -175,6 +180,13 @@ static const char* const proprietary_med |
@@ -175,6 +180,13 @@ static const char* const proprietary_med |
19 |
"audio/mpeg", |
// AAC / ADTS |
20 |
"audio/aac", |
"audio/aac", |
21 |
|
|
22 |
+ // Matroska |
+ // Matroska |
64 |
case MPEG2_AAC_LC: |
case MPEG2_AAC_LC: |
65 |
case MPEG2_AAC_MAIN: |
case MPEG2_AAC_MAIN: |
66 |
@@ -592,6 +613,10 @@ bool MimeUtil::IsCodecProprietary(Codec |
@@ -592,6 +613,10 @@ bool MimeUtil::IsCodecProprietary(Codec |
|
case H264_BASELINE: |
|
67 |
case H264_MAIN: |
case H264_MAIN: |
68 |
case H264_HIGH: |
case H264_HIGH: |
69 |
|
case HEVC_MAIN: |
70 |
+ case AC3: |
+ case AC3: |
71 |
+ case DTS: |
+ case DTS: |
72 |
+ case MPEG4_SP: |
+ case MPEG4_SP: |