Merge "Test Simultaneous decrypt and remove NULL pointer comparison" into nyc-dev

2016-02-11 17:51:42 +00:00
parent 7c4eaef227 3e5b6d7489
commit 4838979f07
2 changed files with 58 additions and 8 deletions
--- a/libwvdrmengine/cdm/core/src/initialization_data.cpp
+++ b/libwvdrmengine/cdm/core/src/initialization_data.cpp
@@ -357,7 +357,6 @@ bool InitializationData::ConstructWidevineInitData(
                          json_init_data.size());

  // Parse the Json string using jsmn
-  int result = 0;
  jsmn_parser parser;
  jsmntok_t tokens[kDefaultNumJsonTokens];
  jsmn_init(&parser);