| 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..129751fad73eb67da094af12a0a399c47ec0526c 100644
|
| --- a/media/filters/ffmpeg_video_decoder.cc
|
| +++ b/media/filters/ffmpeg_video_decoder.cc
|
| @@ -241,20 +241,13 @@ 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();
|
| + state_ = kUninitialized;
|
| + }
|
| }
|
|
|
| bool FFmpegVideoDecoder::FFmpegDecode(
|
|
|