Attempt decoder fallback when the first decode call fails.

media/filters/decoder_stream.h

Index: media/filters/decoder_stream.h
diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
index 3af3d752b1b3b785e8f1e0ed9c4a6a7513fc9a87..d047882558a1b430679b8e52dd327577c02dd329 100644
--- a/media/filters/decoder_stream.h
+++ b/media/filters/decoder_stream.h
@@ -156,7 +156,10 @@ class MEDIA_EXPORT DecoderStream {
   void FlushDecoder();
 
   // Callback for Decoder::Decode().
-  void OnDecodeDone(int buffer_size, bool end_of_stream, DecoderStatus status);
+  void OnDecodeDone(int sequence_token,
+                    int buffer_size,
+                    bool end_of_stream,
+                    DecoderStatus status);
 
   // Output callback passed to Decoder::Initialize().
   void OnDecodeOutputReady(const scoped_refptr<Output>& output);
@@ -226,6 +229,10 @@ class MEDIA_EXPORT DecoderStream {
   // Tracks the duration of incoming packets over time.
   MovingAverage duration_tracker_;
 
+  // Used to reattempt decoding when decode fails right after Initialize().
+  std::deque<scoped_refptr<DecoderBuffer>> pending_buffers_;
+  int sequence_token_;
+
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<DecoderStream<StreamType> > weak_factory_;
 };