diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 03:26:37 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 03:26:37 +0000 |
| commit | 43580b3c026bfbb6d1cb8ff130bb8c375ddae994 (patch) | |
| tree | b2b981c2c0c72141b3a8b8d21697bb621030c765 | |
| parent | 20271f35b0f02ec3c116363ef2f0357ede65608a (diff) | |
| download | chromium_src-43580b3c026bfbb6d1cb8ff130bb8c375ddae994.zip chromium_src-43580b3c026bfbb6d1cb8ff130bb8c375ddae994.tar.gz chromium_src-43580b3c026bfbb6d1cb8ff130bb8c375ddae994.tar.bz2 | |
ffmpeg roll chromium binaries
bug=none
test=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42727 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | media/base/pipeline_impl.cc | 3 | ||||
| -rw-r--r-- | media/tools/media_bench/media_bench.cc | 4 |
3 files changed, 5 insertions, 4 deletions
@@ -2,7 +2,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "webkit_revision": "56476", - "ffmpeg_revision": "42314", + "ffmpeg_revision": "42726", "skia_revision": "504", "chromium_git": "http://src.chromium.org/git", "swig_revision": "40423", diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc index 0331e5c..27ca083 100644 --- a/media/base/pipeline_impl.cc +++ b/media/base/pipeline_impl.cc @@ -214,7 +214,8 @@ base::TimeDelta PipelineImpl::GetCurrentTime() const { // |state_| is only accessed on |message_loop_|. AutoLock auto_lock(lock_); base::TimeDelta elapsed = clock_.Elapsed(); - if (state_ == kEnded || elapsed > duration_) { + if (state_ == kEnded || + (duration_.ToInternalValue() && (elapsed > duration_))) { return duration_; } return elapsed; diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc index 47b767b..18ac81c8 100644 --- a/media/tools/media_bench/media_bench.cc +++ b/media/tools/media_bench/media_bench.cc @@ -472,9 +472,9 @@ int main(int argc, const char** argv) { // Make sure our decoding went OK. if (result < 0) { - std::cerr << "Error: avcodec_decode returned " + std::cerr << "WARNING: avcodec_decode returned " << result << " for " << in_path << std::endl; - return 1; + // return 1; } } // Free our packet. |