| Index: talk/media/devices/filevideocapturer.h
|
| diff --git a/talk/media/devices/filevideocapturer.h b/talk/media/devices/filevideocapturer.h
|
| index 3ef82efed1044e389db36cc60a5a596fa9b3baaa..214a8c50332dd52737cf5320bca5833e3e3039b0 100644
|
| --- a/talk/media/devices/filevideocapturer.h
|
| +++ b/talk/media/devices/filevideocapturer.h
|
| @@ -122,7 +122,7 @@ class FileVideoCapturer : public VideoCapturer {
|
|
|
| protected:
|
| // Override virtual methods of parent class VideoCapturer.
|
| - virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs);
|
| + virtual bool GetPreferredFourccs(std::vector<uint32_t>* fourccs);
|
|
|
| // Read the frame header from the file stream, video_file_.
|
| rtc::StreamResult ReadFrameHeader(CapturedFrame* frame);
|
| @@ -146,11 +146,11 @@ class FileVideoCapturer : public VideoCapturer {
|
| rtc::FileStream video_file_;
|
| CapturedFrame captured_frame_;
|
| // The number of bytes allocated buffer for captured_frame_.data.
|
| - uint32 frame_buffer_size_;
|
| + uint32_t frame_buffer_size_;
|
| FileReadThread* file_read_thread_;
|
| int repeat_; // How many times to repeat the file.
|
| - int64 start_time_ns_; // Time when the file video capturer starts.
|
| - int64 last_frame_timestamp_ns_; // Timestamp of last read frame.
|
| + int64_t start_time_ns_; // Time when the file video capturer starts.
|
| + int64_t last_frame_timestamp_ns_; // Timestamp of last read frame.
|
| bool ignore_framerate_;
|
|
|
| RTC_DISALLOW_COPY_AND_ASSIGN(FileVideoCapturer);
|
|
|