| commit | ae1a535c990d4634eb4f1fa700bedf5171036028 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Feb 28 18:09:55 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 28 18:09:55 2022 +0000 |
| tree | 2fc2a5019c51cc3d07d88757d5a9b1fbd7571003 | |
| parent | 13949b32a11ec1302492fe2ce5dd8d563c49e08d [diff] | |
| parent | 9eb9338321ec1789ff32d7fcddda4c0f593b5e5a [diff] |
Merge "Fix && used in place of &" am: c4b8e37802 am: 9eb9338321 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2001133 Change-Id: I83984128124b3272c5ebfa0693d7102fc88f4c13
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) {