summaryrefslogtreecommitdiff
path: root/camera/device/3.4/default/ExternalCameraDevice.cpp
diff options
context:
space:
mode:
authorSteven Laver <lavers@google.com>2019-10-24 16:40:00 -0700
committerDaniel Norman <danielnorman@google.com>2019-10-25 13:27:06 -0700
commit76b1977dca6b72018663a9cd476f7c3d0604db31 (patch)
tree788b2782ca42def0e34f44897369979e3089a322 /camera/device/3.4/default/ExternalCameraDevice.cpp
parent4db99f68ffc39b3e821b76fe66642e066149b645 (diff)
parent6acc7b439ee8813198ddaecb86757c2da5d6c872 (diff)
Merge RP1A.191024.001
Change-Id: I22b7b600104c6d7fd4d448dd2efdeb20f95ca28b
Diffstat (limited to 'camera/device/3.4/default/ExternalCameraDevice.cpp')
-rw-r--r--camera/device/3.4/default/ExternalCameraDevice.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/camera/device/3.4/default/ExternalCameraDevice.cpp b/camera/device/3.4/default/ExternalCameraDevice.cpp
index 9a2fddff88..f518a155a7 100644
--- a/camera/device/3.4/default/ExternalCameraDevice.cpp
+++ b/camera/device/3.4/default/ExternalCameraDevice.cpp
@@ -754,11 +754,11 @@ void ExternalCameraDevice::getFrameRateList(
int fd, double fpsUpperBound, SupportedV4L2Format* format) {
format->frameRates.clear();
- v4l2_frmivalenum frameInterval {
- .pixel_format = format->fourcc,
- .width = format->width,
- .height = format->height,
- .index = 0
+ v4l2_frmivalenum frameInterval{
+ .index = 0,
+ .pixel_format = format->fourcc,
+ .width = format->width,
+ .height = format->height,
};
for (frameInterval.index = 0;