Fix AnnexB validation logic to work with encrypted content.

media/formats/mp4/avc.h

Index: media/formats/mp4/avc.h
diff --git a/media/formats/mp4/avc.h b/media/formats/mp4/avc.h
index 0d84eef9c8c94d6903add268b78952dc85c23214..1740b8fc92c7c7a2ac4a560b3827d31a770d7b6d 100644
--- a/media/formats/mp4/avc.h
+++ b/media/formats/mp4/avc.h
@@ -39,11 +39,15 @@ class MEDIA_EXPORT AVC {
 
   // Verifies that the contents of |buffer| conform to
   // Section 7.4.1.2.3 of ISO/IEC 14496-10.
+  // |subsamples| contains the information about what parts of the buffer are
+  // encrypted and which parts are clear.
   // Returns true if |buffer| contains conformant Annex B data
   // TODO(acolwell): Remove the std::vector version when we can use,
   // C++11's std::vector<T>::data() method.
-  static bool IsValidAnnexB(const std::vector<uint8>& buffer);
-  static bool IsValidAnnexB(const uint8* buffer, size_t size);
+  static bool IsValidAnnexB(const std::vector<uint8>& buffer,
+                            const std::vector<SubsampleEntry>& subsamples);
+  static bool IsValidAnnexB(const uint8* buffer, size_t size,
+                            const std::vector<SubsampleEntry>& subsamples);
 };
 
 }  // namespace mp4