Merge 70669 - Don't uninitialize FFmpegVideoDecodeEngine if we haven't initia...

media/filters/ffmpeg_video_decoder.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 
 #include <deque>
 
 #include "base/gtest_prod_util.h"
@@ skipping 54 matching lines @@
 
   // The TimeTuple struct is used to hold the needed timestamp data needed for
   // enqueuing a video frame.
   struct TimeTuple {
     base::TimeDelta timestamp;
     base::TimeDelta duration;
   };
 
   enum DecoderState {
     kUnInitialized,
+    kInitializing,
     kNormal,
     kFlushCodec,
     kDecodeFinished,
     kPausing,
     kFlushing,
     kStopped
   };
 
   void OnFlushComplete(FilterCallback* callback);
   void OnSeekComplete(FilterCallback* callback);
@@ skipping 46 matching lines @@
 
   // Pointer to the demuxer stream that will feed us compressed buffers.
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_