| commit | b281428b5cafa4564fc5bf7e75b0ed2354be0a41 | [log] [tgz] |
|---|---|---|
| author | Yixiao Luo <yixiaoluo@google.com> | Fri Nov 22 06:41:41 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 22 06:41:41 2024 +0000 |
| tree | 42c7a0f6d42406cf0d4d5f3892cbe777b22c3f87 | |
| parent | 76bd5a0a33f865f3c7c4efaaab554fbbd9aabdef [diff] | |
| parent | 5d1e90cd612c54c2ca7aeea004c302ae0b22f8fd [diff] |
Merge "Fixed LinearBlock thumbnail crash issue" into main am: 5d1e90cd61 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3351159 Change-Id: Id6321a36b334d9550a0011430f1359e329110889 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 efbd682..35370e7 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp
@@ -6093,9 +6093,9 @@ } if (csd->size() == 0) { ALOGW("csd-%zu size is 0", i); + } else { + mCSD.push_back(csd); } - - mCSD.push_back(csd); ++i; }