am 40311d0c: am 357e6c41: Merge "Haystack and Obfuscated OEMCrypto Level 3" into klp-dev

* commit '40311d0c6c44a3d876ce843534cd98c58f65ca4d': Haystack and Obfuscated OEMCrypto Level 3
2013-11-07 21:30:28 -08:00
parent ad51a53db4 40311d0c6c
commit 235fb36f8a
10 changed files with 51 additions and 33 deletions
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -25,7 +25,7 @@
 #include "file_store.h"
 #include "properties.h"

-using namespace wvoec_level3;
+using namespace wvoec3;

 namespace wvcdm {