diff options
| -rw-r--r-- | build/common.gypi | 7 | ||||
| -rw-r--r-- | net/base/mime_util.cc | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 05adc1a..6aad1932 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -189,6 +189,10 @@ # Whether usage of OpenMAX is enabled. 'enable_openmax%': 0, + # Whether proprietary audio/video codecs are assumed to be included with + # this build (only meaningful if branding!=Chrome). + 'proprietary_codecs%': 0, + # TODO(bradnelson): eliminate this when possible. # To allow local gyp files to prevent release.vsprops from being included. # Yes(1) means include release.vsprops. @@ -400,6 +404,9 @@ ['chromeos==1', { 'defines': ['OS_CHROMEOS=1'], }], + ['proprietary_codecs==1', { + 'defines': ['USE_PROPRIETARY_CODECS'], + }], ['fastbuild!=0', { 'conditions': [ # Finally, for Windows, we simply turn on profiling. diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index aa3934b..5d975e6 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 |