summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorralphl@chromium.org <ralphl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 17:03:35 +0000
committerralphl@chromium.org <ralphl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 17:03:35 +0000
commit5457d6cfa40b74e08e6bf73a23c06049e06bf439 (patch)
treea7d05256165ed766760234fa604382dd159306e2 /media
parent6637bc0b874879f4d5e407a9c0ae01719bf24e34 (diff)
downloadchromium_src-5457d6cfa40b74e08e6bf73a23c06049e06bf439.zip
chromium_src-5457d6cfa40b74e08e6bf73a23c06049e06bf439.tar.gz
chromium_src-5457d6cfa40b74e08e6bf73a23c06049e06bf439.tar.bz2
DCHECK now allows SetPlaybackRate(0.0f) if the pipeline is stopped.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/pipeline_impl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 5bc3faa..a4c85d5 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -158,7 +158,8 @@ void PipelineImpl::SetPlaybackRate(float rate) {
if (OkToCallThread() && rate >= 0.0f) {
pipeline_thread_->SetPlaybackRate(rate);
} else {
- NOTREACHED();
+ // It's OK for a client to call SetPlaybackRate(0.0f) if we're stopped.
+ DCHECK(rate == 0.0f && playback_rate_ == 0.0f);
}
}