Index: media/video/capture/android/video_capture_device_android.cc |
diff --git a/media/video/capture/android/video_capture_device_android.cc b/media/video/capture/android/video_capture_device_android.cc |
index adfa9a3455c12bf5293b8fd1aae87a5a965a472c..daf515eff8e0595cb0d5cb53bffe912eb862432a 100644 |
--- a/media/video/capture/android/video_capture_device_android.cc |
+++ b/media/video/capture/android/video_capture_device_android.cc |
@@ -222,7 +222,7 @@ void VideoCaptureDeviceAndroid::OnFrameAvailable( |
client_->OnIncomingCapturedFrame(reinterpret_cast<uint8*>(buffer), |
length, |
- base::Time::Now(), |
+ base::TimeStamp::Now(), |
miu
2014/01/06 22:39:37
I think you meant base::TimeTicks here.
sheu
2014/01/06 22:52:37
Done.
|
rotation, |
capture_format_); |
} |