| Index: media/capture/video/linux/video_capture_device_factory_linux.cc
|
| diff --git a/media/capture/video/linux/video_capture_device_factory_linux.cc b/media/capture/video/linux/video_capture_device_factory_linux.cc
|
| index f7dfa53d3b8d8347c59424faa06aaf078d236e77..f1d89f8bc33750969040f295f84292c736cd0302 100644
|
| --- a/media/capture/video/linux/video_capture_device_factory_linux.cc
|
| +++ b/media/capture/video/linux/video_capture_device_factory_linux.cc
|
| @@ -23,7 +23,7 @@
|
|
|
| namespace media {
|
|
|
| -static bool HasUsableFormats(int fd, uint32 capabilities) {
|
| +static bool HasUsableFormats(int fd, uint32_t capabilities) {
|
| const std::list<uint32_t>& usable_fourccs =
|
| VideoCaptureDeviceLinux::GetListOfUsableFourCCs(false);
|
|
|
| @@ -51,9 +51,9 @@ static bool HasUsableFormats(int fd, uint32 capabilities) {
|
| }
|
|
|
| static std::list<float> GetFrameRateList(int fd,
|
| - uint32 fourcc,
|
| - uint32 width,
|
| - uint32 height) {
|
| + uint32_t fourcc,
|
| + uint32_t width,
|
| + uint32_t height) {
|
| std::list<float> frame_rates;
|
|
|
| v4l2_frmivalenum frame_interval = {};
|
|
|