commit | 713d77a2ac6badfbde82e12e771ebb7c169a08bc | [log] [tgz] |
---|---|---|
author | Yixiao Luo <yixiaoluo@google.com> | Fri Nov 22 07:08:55 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 22 07:08:55 2024 +0000 |
tree | 177edcad8de76b0078265b4cd578e94fe67b61cd | |
parent | 2c10da331e99c181df9c9b6875d2ee6fba982f19 [diff] | |
parent | b281428b5cafa4564fc5bf7e75b0ed2354be0a41 [diff] |
Merge "Fixed LinearBlock thumbnail crash issue" into main am: 5d1e90cd61 am: b281428b5c Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3351159 Change-Id: I5f620040bb6e201d99c57ff2d5bf84f16c166b8b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index eb7edaf..f917aa2 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp
@@ -6092,9 +6092,9 @@ } if (csd->size() == 0) { ALOGW("csd-%zu size is 0", i); + } else { + mCSD.push_back(csd); } - - mCSD.push_back(csd); ++i; }