| Index: media/base/pipeline.cc
|
| diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
|
| index 0f268c967efeb3f2759af823991d92d0adec412e..95d1de8ed284329a58248eb9d7b4368ada2cc6ce 100644
|
| --- a/media/base/pipeline.cc
|
| +++ b/media/base/pipeline.cc
|
| @@ -1137,17 +1137,13 @@ void Pipeline::OnDemuxerBuilt(PipelineStatus status, Demuxer* demuxer) {
|
| return;
|
| }
|
|
|
| + demuxer_ = demuxer;
|
| if (status != PIPELINE_OK) {
|
| SetError(status);
|
| return;
|
| }
|
|
|
| - if (!demuxer) {
|
| - SetError(PIPELINE_ERROR_REQUIRED_FILTER_MISSING);
|
| - return;
|
| - }
|
| -
|
| - demuxer_ = demuxer;
|
| + CHECK(demuxer_) << "Null demuxer encountered despite PIPELINE_OK.";
|
| demuxer_->set_host(this);
|
|
|
| {
|
|
|