diff options
| -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, 4 insertions, 5 deletions
@@ -2,7 +2,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "webkit_revision": "56476", - "ffmpeg_revision": "42726", + "ffmpeg_revision": "42314", "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 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; diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc index 18ac81c8..47b767b 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 << "WARNING: avcodec_decode returned " + std::cerr << "Error: avcodec_decode returned " << result << " for " << in_path << std::endl; - // return 1; + return 1; } } // Free our packet. |