Fix inserting SPS/PPS after AUD NALU

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 1740b8fc92c7c7a2ac4a560b3827d31a770d7b6d..4d8769c8f6a5f6038c69863ab4ed9a8a51a86a13 100644
--- a/media/formats/mp4/avc.h
+++ b/media/formats/mp4/avc.h
@@ -34,8 +34,7 @@ class MEDIA_EXPORT AVC {
 
   static bool ConvertConfigToAnnexB(
       const AVCDecoderConfigurationRecord& avc_config,
-      std::vector<uint8>* buffer,
-      std::vector<SubsampleEntry>* subsamples);
+      std::vector<uint8>* buffer);
 
   // Verifies that the contents of |buffer| conform to
   // Section 7.4.1.2.3 of ISO/IEC 14496-10.
@@ -48,6 +47,12 @@ class MEDIA_EXPORT AVC {
                             const std::vector<SubsampleEntry>& subsamples);
   static bool IsValidAnnexB(const uint8* buffer, size_t size,
                             const std::vector<SubsampleEntry>& subsamples);
+
+  // Given a |buffer| and |subsamples| information and |pts| pointer into the
+  // |buffer| finds the index of the subsample |ptr| is pointing into.
+  static int FindSubsampleIndex(const std::vector<uint8>& buffer,
+                                const std::vector<SubsampleEntry>* subsamples,
+                                const uint8* ptr);
 };
 
 }  // namespace mp4