diff options
| author | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 15:18:42 +0000 |
|---|---|---|
| committer | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 15:18:42 +0000 |
| commit | e7a55d43409394da9edd525ad234257a572e89a4 (patch) | |
| tree | d6872172562701edfe683d5e81fb51e78ee5cfa7 /content | |
| parent | 9b34cfc92e411eebdfa8727b241682668208e9ec (diff) | |
| download | chromium_src-e7a55d43409394da9edd525ad234257a572e89a4.zip chromium_src-e7a55d43409394da9edd525ad234257a572e89a4.tar.gz chromium_src-e7a55d43409394da9edd525ad234257a572e89a4.tar.bz2 | |
Fixed compilation for KitKat SDK
NOTRY=true
BUG=224793
TESTED=Verified that the build with K SDK and use_proprietary_codecs=1 succeeds.
Review URL: https://chromiumcodereview.appspot.com/23465023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/media/crypto/key_systems_info.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/renderer/media/crypto/key_systems_info.cc b/content/renderer/media/crypto/key_systems_info.cc index ff84f57..0f0dccb 100644 --- a/content/renderer/media/crypto/key_systems_info.cc +++ b/content/renderer/media/crypto/key_systems_info.cc @@ -110,8 +110,11 @@ static void AddPepperBasedWidevine( #elif defined(OS_ANDROID) static void AddAndroidWidevine( std::vector<KeySystemInfo>* concrete_key_systems) { - SupportedCodecs supported_codecs = MP4_AAC | MP4_AVC1; +#if defined(USE_PROPRIETARY_CODECS) + SupportedCodecs supported_codecs = + static_cast<SupportedCodecs>(MP4_AAC | MP4_AVC1); AddWidevineForTypes(supported_codecs, concrete_key_systems); +#endif // defined(USE_PROPRIETARY_CODECS) } #endif // defined(ENABLE_PEPPER_CDMS) #endif // defined(WIDEVINE_CDM_AVAILABLE) |