Fold {Audio|Video}Decoder::Stop() into the dtor.

media/filters/ffmpeg_audio_decoder.cc

Index: media/filters/ffmpeg_audio_decoder.cc
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
index 28347acb52e6ec971eac58b5b2ab5f9f98169870..b45b9401b56d79dee342fd90113002acc6cbaaf1 100644
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -135,9 +135,12 @@ FFmpegAudioDecoder::FFmpegAudioDecoder(
 }
 
 FFmpegAudioDecoder::~FFmpegAudioDecoder() {
-  DCHECK_EQ(state_, kUninitialized);
-  DCHECK(!codec_context_);
-  DCHECK(!av_frame_);
+  DCHECK(task_runner_->BelongsToCurrentThread());
+
+  if (state_ != kUninitialized) {
+    ReleaseFFmpegResources();
+    ResetTimestampState();
+  }
 }
 
 void FFmpegAudioDecoder::Initialize(const AudioDecoderConfig& config,
@@ -192,17 +195,6 @@ void FFmpegAudioDecoder::Reset(const base::Closure& closure) {
   task_runner_->PostTask(FROM_HERE, closure);
 }
 
-void FFmpegAudioDecoder::Stop() {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-
-  if (state_ == kUninitialized)
-    return;
-
-  ReleaseFFmpegResources();
-  ResetTimestampState();
-  state_ = kUninitialized;
-}
-
 void FFmpegAudioDecoder::DecodeBuffer(
     const scoped_refptr<DecoderBuffer>& buffer,
     const DecodeCB& decode_cb) {