Source release v2.1.6-0-824 + third_party libs

Change-Id: If190f81154326aa7dc22d66009687f389146ddfd
2014-07-14 13:25:39 -07:00
parent fa64436e4f
commit 97b453dd71
11 changed files with 522 additions and 173 deletions
--- a/cdm/include/wv_content_decryption_module.h
+++ b/cdm/include/wv_content_decryption_module.h
@@ -95,8 +95,8 @@ class WvContentDecryptionModule : public cdm::ContentDecryptionModule,

  virtual bool IsKeyValid(const uint8_t* key_id, int key_id_size) OVERRIDE;

-  virtual cdm::Status CancelKeyRequest(const char* session_id,
-                                       int session_id_size) OVERRIDE;
+  virtual cdm::Status CloseSession(const char* session_id,
+                                   int session_id_size) OVERRIDE;

  virtual void TimerExpired(void* context) OVERRIDE;