Bug 1573833 - Add missing & and parentheses r=pehrsons
authorSylvestre Ledru <sledru@mozilla.com>
Fri, 16 Aug 2019 08:11:39 +0000
changeset 488462 a550b308d88ae8e6bbdd1bab0123028ca98512d8
parent 488461 0a7463d82e5f5f3cbca589baab9abc07881f5142
child 488463 983ff93a11ad7c08fd65a507dedf01526e4ae682
push id92760
push usersledru@mozilla.com
push dateFri, 16 Aug 2019 08:12:54 +0000
treeherderautoland@a550b308d88a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspehrsons
bugs1573833
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1573833 - Add missing & and parentheses r=pehrsons Differential Revision: https://phabricator.services.mozilla.com/D41957
dom/media/mp4/MoofParser.cpp
--- a/dom/media/mp4/MoofParser.cpp
+++ b/dom/media/mp4/MoofParser.cpp
@@ -515,17 +515,17 @@ Moof::Moof(Box& aBox, const TrackParseMo
       // increased by the sample's duration, so we rewrite the dts accordingly.
       int64_t presentationDuration =
           ctsOrder.LastElement()->mCompositionRange.end -
           ctsOrder[0]->mCompositionRange.start;
       auto decodeOffset =
           aMdhd.ToMicroseconds((int64_t)*aDecodeTime - aEdts.mMediaStart);
       auto offsetOffset = aMvhd.ToMicroseconds(aEdts.mEmptyOffset);
       int64_t endDecodeTime =
-          decodeOffset.isOk() & offsetOffset.isOk()
+          (decodeOffset.isOk() && offsetOffset.isOk())
               ? decodeOffset.unwrap() + offsetOffset.unwrap()
               : 0;
       int64_t decodeDuration = endDecodeTime - mIndex[0].mDecodeTime;
       double adjust = !!presentationDuration
                           ? (double)decodeDuration / presentationDuration
                           : 0;
       int64_t dtsOffset = mIndex[0].mDecodeTime;
       int64_t compositionDuration = 0;