diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 03:29:50 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 03:29:50 +0000 |
| commit | d803c41d9a4c8617dd0a3c197a8bf17703a109f1 (patch) | |
| tree | 22eb07cb3cbbcb98c6e803bee501ea04e6a05c4e /media/base/pipeline_impl.cc | |
| parent | 43580b3c026bfbb6d1cb8ff130bb8c375ddae994 (diff) | |
| download | chromium_src-d803c41d9a4c8617dd0a3c197a8bf17703a109f1.zip chromium_src-d803c41d9a4c8617dd0a3c197a8bf17703a109f1.tar.gz chromium_src-d803c41d9a4c8617dd0a3c197a8bf17703a109f1.tar.bz2 | |
Revert 42727 - ffmpeg roll chromium binaries
bug=none
test=none
TBR=fbarchard@chromium.org
Review URL: http://codereview.chromium.org/1401002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline_impl.cc')
| -rw-r--r-- | media/base/pipeline_impl.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc index 27ca083..0331e5c 100644 --- a/media/base/pipeline_impl.cc +++ b/media/base/pipeline_impl.cc @@ -214,8 +214,7 @@ base::TimeDelta PipelineImpl::GetCurrentTime() const { // |state_| is only accessed on |message_loop_|. AutoLock auto_lock(lock_); base::TimeDelta elapsed = clock_.Elapsed(); - if (state_ == kEnded || - (duration_.ToInternalValue() && (elapsed > duration_))) { + if (state_ == kEnded || elapsed > duration_) { return duration_; } return elapsed; |