diff options
author | Bill Rassieur <rassb@google.com> | 2018-12-06 22:33:16 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-12-06 22:33:16 -0800 |
commit | 42ae128f0fb0948f5a2408b12e6a4b14bded15d5 (patch) | |
tree | 628c1ed91bd4da9c0e2a9b5abb1e933b79ad75c3 | |
parent | ed07a1380cce31024e2a1a5fb2ca9c8ee577710f (diff) | |
parent | 90457c30d583b199631901b7c89d69eaec343976 (diff) | |
download | v4l2_codec2-42ae128f0fb0948f5a2408b12e6a4b14bded15d5.tar.gz |
Merge PQ1A.181205.006 from Pi-QPR1-Release into ToT for Pi-Platform release.\n\nBUG: 120448245
am: 90457c30d5
Change-Id: I61bec96e85db721975bdec8b3d71ff82b7f90896
-rw-r--r-- | vda/v4l2_slice_video_decode_accelerator.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vda/v4l2_slice_video_decode_accelerator.cc b/vda/v4l2_slice_video_decode_accelerator.cc index 0ae7a56..4e82dbd 100644 --- a/vda/v4l2_slice_video_decode_accelerator.cc +++ b/vda/v4l2_slice_video_decode_accelerator.cc @@ -998,6 +998,7 @@ void V4L2SliceVideoDecodeAccelerator::Dequeue() { if (it == surfaces_at_device_.end()) { VLOGF(1) << "Got invalid surface from device."; NOTIFY_ERROR(PLATFORM_FAILURE); + return; } it->second->SetDecoded(); |