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

media/filters/ffmpeg_video_decoder.cc

Index: media/filters/ffmpeg_video_decoder.cc
===================================================================
--- media/filters/ffmpeg_video_decoder.cc	(revision 70815)
+++ media/filters/ffmpeg_video_decoder.cc	(working copy)
@@ -97,6 +97,7 @@
   config.opaque_context = av_stream;
   config.width = width_;
   config.height = height_;
+  state_ = kInitializing;
   decode_engine_->Initialize(message_loop(), this, NULL, config);
 }
 
@@ -139,7 +140,10 @@
   DCHECK(!uninitialize_callback_.get());
 
   uninitialize_callback_.reset(callback);
-  decode_engine_->Uninitialize();
+  if (state_ != kUnInitialized)
+    decode_engine_->Uninitialize();
+  else
+    OnUninitializeComplete();
 }
 
 void FFmpegVideoDecoder::OnUninitializeComplete() {