--- a/dom/media/fmp4/MP4Demuxer.cpp
+++ b/dom/media/fmp4/MP4Demuxer.cpp
@@ -401,33 +401,32 @@ MP4TrackDemuxer::GetSamples(int32_t aNum
     }
     samples->mSamples.AppendElement(sample);
     aNumSamples--;
   }
 
   if (samples->mSamples.IsEmpty()) {
     return SamplesPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_END_OF_STREAM,
                                            __func__);
-  } else {
-    for (const auto& sample : samples->mSamples) {
-      // Collect telemetry from h264 Annex B SPS.
-      if (mNeedSPSForTelemetry && mp4_demuxer::AnnexB::HasSPS(sample)) {
-        RefPtr<MediaByteBuffer> extradata =
+  }
+  for (const auto& sample : samples->mSamples) {
+    // Collect telemetry from h264 Annex B SPS.
+    if (mNeedSPSForTelemetry && mp4_demuxer::AnnexB::HasSPS(sample)) {
+      RefPtr<MediaByteBuffer> extradata =
         mp4_demuxer::AnnexB::ExtractExtraData(sample);
-        mNeedSPSForTelemetry = AccumulateSPSTelemetry(extradata);
-      }
+      mNeedSPSForTelemetry = AccumulateSPSTelemetry(extradata);
     }
+  }
 
-    if (mNextKeyframeTime.isNothing()
-        || samples->mSamples.LastElement()->mTime
-           >= mNextKeyframeTime.value().ToMicroseconds()) {
-      SetNextKeyFrameTime();
-    }
-    return SamplesPromise::CreateAndResolve(samples, __func__);
+  if (mNextKeyframeTime.isNothing()
+      || samples->mSamples.LastElement()->mTime
+      >= mNextKeyframeTime.value().ToMicroseconds()) {
+    SetNextKeyFrameTime();
   }
+  return SamplesPromise::CreateAndResolve(samples, __func__);
 }
 
 void
 MP4TrackDemuxer::SetNextKeyFrameTime()
 {
   mNextKeyframeTime.reset();
   mp4_demuxer::Microseconds frameTime = mIterator->GetNextKeyframeTime();
   if (frameTime != -1) {
@@ -472,20 +471,19 @@ MP4TrackDemuxer::SkipToNextRandomAccessP
     if (sample->mKeyframe && sample->mTime >= aTimeThreshold.ToMicroseconds()) {
       found = true;
       mQueuedSample = sample;
     }
   }
   SetNextKeyFrameTime();
   if (found) {
     return SkipAccessPointPromise::CreateAndResolve(parsed, __func__);
-  } else {
-    SkipFailureHolder failure(NS_ERROR_DOM_MEDIA_END_OF_STREAM, parsed);
-    return SkipAccessPointPromise::CreateAndReject(Move(failure), __func__);
   }
+  SkipFailureHolder failure(NS_ERROR_DOM_MEDIA_END_OF_STREAM, parsed);
+  return SkipAccessPointPromise::CreateAndReject(Move(failure), __func__);
 }
 
 media::TimeIntervals
 MP4TrackDemuxer::GetBuffered()
 {
   EnsureUpToDateIndex();
   AutoPinned<MediaResource> resource(mParent->mResource);
   MediaByteRangeSet byteRanges;