Index: media/base/decrypt_config.cc |
diff --git a/media/base/decrypt_config.cc b/media/base/decrypt_config.cc |
index c499c92d66565d6e7f4b130df72adcf2eb4500db..0d2960bce757514dd91b3f41c27ee6f44760dbb5 100644 |
--- a/media/base/decrypt_config.cc |
+++ b/media/base/decrypt_config.cc |
@@ -19,7 +19,9 @@ DecryptConfig::DecryptConfig(const std::string& key_id, |
data_offset_(data_offset), |
subsamples_(subsamples) { |
CHECK_GT(key_id.size(), 0u); |
- CHECK_EQ(iv.size(), static_cast<size_t>(DecryptConfig::kDecryptionKeySize)); |
+ CHECK_EQ( |
+ iv.size() == static_cast<size_t>(DecryptConfig::kDecryptionKeySize) || |
+ iv.empty(), true); |
xhwang
2012/08/01 00:45:41
CHECK(iv.empty() || iv.size() == static_cast<size_
fgalligan1
2012/08/01 01:36:10
Done.
|
CHECK_GE(data_offset, 0); |
} |