Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(869)

Unified Diff: net/base/mime_util.cc

Issue 2001004: Added #ifdef to allow Chromium to enable proprietary codecs. (Closed)
Patch Set: Fix Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/mime_util.cc
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index aa3934bc40ea309e0b55fc2aa1275ab4fb61b06b..5d975e6b03acf0d892eefee2eee12413794b0ddb 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -189,7 +189,7 @@ static const char* const supported_media_types[] = {
"audio/ogg",
"application/ogg",
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
// MPEG-4.
"video/mp4",
"video/x-m4v",
@@ -208,7 +208,7 @@ static const char* const supported_media_types[] = {
// Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
// for more information.
static const char* const supported_media_codecs[] = {
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
"avc1",
"mp4a",
#endif
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698