summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2014-11-18 18:04:28 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-18 18:04:29 +0000
commit56090472230dc56acc203589f3efcb65579fb54d (patch)
tree3ed53fe6e6427cdfa1d496e4af5c16355cfacb84
parenta58336f6c8aa44373485e5a6d7ec32677387a935 (diff)
parent452efb218eb9af6ab2763879645bfc92db8ba02a (diff)
downloadframeworks_base-56090472230dc56acc203589f3efcb65579fb54d.zip
frameworks_base-56090472230dc56acc203589f3efcb65579fb54d.tar.gz
frameworks_base-56090472230dc56acc203589f3efcb65579fb54d.tar.bz2
Merge "Use standard initializers"
-rw-r--r--core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
index 35e9a1c..7dafb1b 100644
--- a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
+++ b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
@@ -312,8 +312,8 @@ static status_t produceFrame(const sp<ANativeWindow>& anw,
case HAL_PIXEL_FORMAT_BLOB: {
int8_t* img = NULL;
struct camera3_jpeg_blob footer = {
- jpeg_blob_id: CAMERA3_JPEG_BLOB_ID,
- jpeg_size: (uint32_t)bufferLength
+ .jpeg_blob_id = CAMERA3_JPEG_BLOB_ID,
+ .jpeg_size = (uint32_t)bufferLength
};
size_t totalJpegSize = bufferLength + sizeof(footer);