Index: media/filters/ffmpeg_video_decoder.cc |
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc |
index 3436aa9955dd28acad64b98f93730f54ae75d7b1..b7da7f7a462d17f15fe57d6e2e7e193b46dfef98 100644 |
--- a/media/filters/ffmpeg_video_decoder.cc |
+++ b/media/filters/ffmpeg_video_decoder.cc |
@@ -241,20 +241,11 @@ void FFmpegVideoDecoder::Reset(const base::Closure& closure) { |
task_runner_->PostTask(FROM_HERE, closure); |
} |
-void FFmpegVideoDecoder::Stop() { |
+FFmpegVideoDecoder::~FFmpegVideoDecoder() { |
DCHECK(task_runner_->BelongsToCurrentThread()); |
- if (state_ == kUninitialized) |
- return; |
- |
- ReleaseFFmpegResources(); |
- state_ = kUninitialized; |
-} |
- |
-FFmpegVideoDecoder::~FFmpegVideoDecoder() { |
- DCHECK_EQ(kUninitialized, state_); |
- DCHECK(!codec_context_); |
- DCHECK(!av_frame_); |
+ if (state_ != kUninitialized) |
+ ReleaseFFmpegResources(); |
} |
bool FFmpegVideoDecoder::FFmpegDecode( |