| Index: talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
|
| diff --git a/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc b/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
|
| index 69c350ab5e5b71e2d8891854abb2c3e0876c271c..6904c9f5512ebf0303f97819c59c0f5c3ae6a674 100644
|
| --- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
|
| +++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
|
| @@ -148,7 +148,7 @@ void AndroidVideoCapturerJni::AsyncCapturerInvoke(
|
| invoker_->AsyncInvoke<void>(rtc::Bind(method, capturer_, args...));
|
| }
|
|
|
| -void AndroidVideoCapturerJni::ReturnBuffer(int64 time_stamp) {
|
| +void AndroidVideoCapturerJni::ReturnBuffer(int64_t time_stamp) {
|
| jmethodID m = GetMethodID(jni(), *j_video_capturer_class_,
|
| "returnBuffer", "(J)V");
|
| jni()->CallVoidMethod(*j_capturer_global_, m, time_stamp);
|
| @@ -177,7 +177,7 @@ void AndroidVideoCapturerJni::OnIncomingFrame(void* video_frame,
|
| int width,
|
| int height,
|
| int rotation,
|
| - int64 time_stamp) {
|
| + int64_t time_stamp) {
|
| const uint8_t* y_plane = static_cast<uint8_t*>(video_frame);
|
| // Android guarantees that the stride is a multiple of 16.
|
| // http://developer.android.com/reference/android/hardware/Camera.Parameters.html#setPreviewFormat%28int%29
|
|
|