| Index: talk/app/webrtc/java/jni/androidvideocapturer_jni.h
|
| diff --git a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
|
| index c2704393779bc6c75002524ae0dcffb110e757bc..03a28aa360305885bb4353bbef2b827651c7151f 100644
|
| --- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
|
| +++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
|
| @@ -66,7 +66,7 @@ class AndroidVideoCapturerJni : public webrtc::AndroidVideoCapturerDelegate {
|
| int width,
|
| int height,
|
| int rotation,
|
| - int64 time_stamp);
|
| + int64_t time_stamp);
|
| void OnOutputFormatRequest(int width, int height, int fps);
|
| protected:
|
| AndroidVideoCapturerJni(JNIEnv* jni, jobject j_video_capturer);
|
| @@ -74,7 +74,7 @@ protected:
|
|
|
| private:
|
| bool Init(jstring device_name);
|
| - void ReturnBuffer(int64 time_stamp);
|
| + void ReturnBuffer(int64_t time_stamp);
|
| JNIEnv* jni();
|
|
|
| // Helper function to make safe asynchronous calls to |capturer_|. The calls
|
|
|