commit c8083cac38163aadb15772ce5ee1c41adcf5b04e
author Ari Hausman-Cohen <arihc@google.com> Wed Oct 31 11:55:04 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 31 11:55:04 2018 -0700
tree 31f823da858bde903949a117fd3fccf3fad2d4b6
parent c8cf32ad34599e8af8c18cfed889d0bd48dd46f3
parent b893b0cedbb96e1bb4b94a53749fde079d7dae1c

Merge "camera: initialize smart pointer before usage" am: 8f89886dad
am: b893b0cedb

Change-Id: I607b8e2eb92c535c2b4e212e33a89583cd71cddd

modules/camera/3_4/arc/cached_frame.cpp

diff --git a/modules/camera/3_4/arc/cached_frame.cpp b/modules/camera/3_4/arc/cached_frame.cpp
index 0489be8..7137505 100644
--- a/modules/camera/3_4/arc/cached_frame.cpp
+++ b/modules/camera/3_4/arc/cached_frame.cpp
@@ -18,7 +18,8 @@
 CachedFrame::CachedFrame()
     : source_frame_(nullptr),
       cropped_buffer_capacity_(0),
-      yu12_frame_(new AllocatedFrameBuffer(0)) {}
+      yu12_frame_(new AllocatedFrameBuffer(0)),
+      scaled_frame_(new AllocatedFrameBuffer(0)) {}
 
 CachedFrame::~CachedFrame() { UnsetSource(); }