| commit | 9eb9338321ec1789ff32d7fcddda4c0f593b5e5a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Feb 28 17:45:35 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 28 17:45:35 2022 +0000 |
| tree | f4f111a61e427fd69ba6041e119fabe6659cef21 | |
| parent | fcfde3efde846614413f569213fd4fcc3b423e12 [diff] | |
| parent | c4b8e378026094e76305e633b4329b681a1cdd95 [diff] |
Merge "Fix && used in place of &" am: c4b8e37802 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2001133 Change-Id: I54faffff2d9f8be781b73f263ef1cb2588f62034
diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp index fb935b6..e0cc5bf 100644 --- a/media/extractors/mp4/MPEG4Extractor.cpp +++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -3501,7 +3501,7 @@ } unsigned mask = br.getBits(8); for (unsigned i = 0; i < 8; i++) { - if (((0x1 << i) && mask) == 0) + if (((0x1 << i) & mask) == 0) continue; if (br.numBitsLeft() < 8) {