Roll FFmpeg for M45.

media/renderers/renderer_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/renderers/renderer_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
@@ skipping 220 matching lines @@
 
 bool RendererImpl::GetWallClockTimes(
     const std::vector<base::TimeDelta>& media_timestamps,
     std::vector<base::TimeTicks>* wall_clock_times) {
   // No BelongsToCurrentThread() checking because this can be called from other
   // threads.
   //
   // TODO(scherkus): Currently called from VideoRendererImpl's internal thread,
   // which should go away at some point http://crbug.com/110814
   if (clockless_video_playback_enabled_for_testing_) {
-    *wall_clock_times = std::vector<base::TimeTicks>(media_timestamps.size(),
-                                                     base::TimeTicks::Now());
+    if (media_timestamps.empty()) {
+      *wall_clock_times = std::vector<base::TimeTicks>(1,
+                                                       base::TimeTicks::Now());
+    } else {
+      *wall_clock_times = std::vector<base::TimeTicks>();
+      for (auto const &media_time : media_timestamps) {

[DaleCurtis, 2015/07/13 02:00:26]

Style is wrong, should be const auto&. No need for {} either.

+        wall_clock_times->push_back(base::TimeTicks() + media_time);
+      }
+    }
     return true;
   }
 
   return time_source_->GetWallClockTimes(media_timestamps, wall_clock_times);
 }
 
 void RendererImpl::SetDecryptorReadyCallback(
     const DecryptorReadyCB& decryptor_ready_cb) {
   // Cancels the previous decryptor request.
   if (decryptor_ready_cb.is_null()) {
@@ skipping 384 matching lines @@
   }
 
   // After OnError() returns, the pipeline may destroy |this|.
   base::ResetAndReturn(&error_cb_).Run(error);
 
   if (!flush_cb_.is_null())
     base::ResetAndReturn(&flush_cb_).Run();
 }
 
 }  // namespace media