widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 66cadaa9 to master

Browse Source 
Change-Id: I2a052d56516f0e246d77148a38191430ff139c3e
This commit is contained in:
Jeff Tinker
2014-03-29 12:33:46 -07:00
parent f23c54d834 66cadaa9fa
commit 55f1de2fe5
16 changed files with 107 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
View File

@@ -49,7 +49,6 @@ CdmResponseType WvContentDecryptionModule::CloseSession(
CdmResponseType WvContentDecryptionModule::GenerateKeyRequest(
const CdmSessionId& session_id,
const CdmKeySetId& key_set_id,
const std::string& mime_type,
const CdmInitData& init_data,
const CdmLicenseType license_type,
CdmAppParameterMap& app_parameters,
@@ -61,7 +60,7 @@ CdmResponseType WvContentDecryptionModule::GenerateKeyRequest(
if (sts != NO_ERROR)
return sts;
}
sts = cdm_engine_->GenerateKeyRequest(session_id, key_set_id, mime_type,
sts = cdm_engine_->GenerateKeyRequest(session_id, key_set_id,
init_data, license_type,
app_parameters, key_request,
server_url);