Return buffers from StreamParsers in a single unified map

media/formats/mp4/mp4_stream_parser.h

Index: media/formats/mp4/mp4_stream_parser.h
diff --git a/media/formats/mp4/mp4_stream_parser.h b/media/formats/mp4/mp4_stream_parser.h
index bf3c688d604d0df7266562d3fe7786c53c3feb30..4e820bff5ebe22f57030a95c6a4c4d0c12d68fbd 100644
--- a/media/formats/mp4/mp4_stream_parser.h
+++ b/media/formats/mp4/mp4_stream_parser.h
@@ -73,11 +73,8 @@ class MEDIA_EXPORT MP4StreamParser : public StreamParser {
   bool PrepareAACBuffer(const AAC& aac_config,
                         std::vector<uint8_t>* frame_buf,
                         std::vector<SubsampleEntry>* subsamples) const;
-  bool EnqueueSample(BufferQueue* audio_buffers,
-                     BufferQueue* video_buffers,
-                     bool* err);
-  bool SendAndFlushSamples(BufferQueue* audio_buffers,
-                           BufferQueue* video_buffers);
+  bool EnqueueSample(BufferQueueMap* buffers, bool* err);
+  bool SendAndFlushSamples(BufferQueueMap* buffers);
 
   void Reset();