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

Unified Diff: content/renderer/media/crypto/key_systems_info.cc

Issue 23975003: Add widevine_cdm_version.h to gyp for android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor fix Created 7 years, 3 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
Index: content/renderer/media/crypto/key_systems_info.cc
diff --git a/content/renderer/media/crypto/key_systems_info.cc b/content/renderer/media/crypto/key_systems_info.cc
index 495fe05e965ab22f269727f3f85431c5e9e60220..f0205af6a6d7cd449cab15044ef3e10d4f242644 100644
--- a/content/renderer/media/crypto/key_systems_info.cc
+++ b/content/renderer/media/crypto/key_systems_info.cc
@@ -77,8 +77,10 @@ static void RegisterWidevine() {
kWidevineUuid,
#endif // defined(ENABLE_PEPPER_CDMS)
"com.widevine");
+#if !defined(OS_ANDROID)
xhwang 2013/09/05 17:32:38 We could use something like WIDEVINE_CDM_WEBM_SUPP
ddorwin 2013/09/05 17:48:43 This is all changing, so don't worry about it. (If
AddSupportedType(kWidevineKeySystem, "video/webm", "vorbis,vp8,vp8.0");
AddSupportedType(kWidevineKeySystem, "audio/webm", "vorbis");
+#endif // !defined(OS_ANDROID)
#if defined(USE_PROPRIETARY_CODECS) && \
defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE)
AddSupportedType(kWidevineKeySystem, "video/mp4", kWidevineVideoMp4Codecs);

Powered by Google App Engine
This is Rietveld 408576698