From 8cb68d8ea8228c160997bf473d01f8bbdee08244 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Fri, 27 Sep 2024 13:15:06 +0200
Subject: [PATCH] Bug 1878510 - Follow-up: Explicitly pass values through
 variadic functions

While MSVC has no issue with this and understands values should be passed,
clang doesn't like it and aborts.
---
 dom/media/mediasource/TrackBuffersManager.cpp | 4 ++--
 dom/media/webm/WebMDemuxer.cpp                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dom/media/mediasource/TrackBuffersManager.cpp b/dom/media/mediasource/TrackBuffersManager.cpp
index 3b18ecf76b..64f7418818 100644
--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -712,7 +712,7 @@ TrackBuffersManager::SegmentParserLoop()
           MSE_DEBUG("Re-creating demuxer, new start (%" PRId64
                     ") is smaller than last parsed end time (%" PRId64 ")",
                     start,
-                    mLastParsedEndTime);
+                    mLastParsedEndTime.value());
           mFrameEndTimeBeforeRecreateDemuxer = Some(end);
           ResetDemuxingState();
           return;
@@ -826,7 +826,7 @@ TrackBuffersManager::CreateDemuxerforMIMEType()
       MSE_DEBUG(
           "CreateDemuxerFromMimeType: "
           "mFrameEndTimeBeforeRecreateDemuxer=%" PRId64,
-          mFrameEndTimeBeforeRecreateDemuxer);
+          mFrameEndTimeBeforeRecreateDemuxer.value());
     }
     mInputDemuxer = new WebMDemuxer(mCurrentInputBuffer, true /* IsMediaSource*/,
                                     mFrameEndTimeBeforeRecreateDemuxer);
diff --git a/dom/media/webm/WebMDemuxer.cpp b/dom/media/webm/WebMDemuxer.cpp
index 476631b83b..df28ee84e9 100644
--- a/dom/media/webm/WebMDemuxer.cpp
+++ b/dom/media/webm/WebMDemuxer.cpp
@@ -182,7 +182,7 @@ WebMDemuxer::WebMDemuxer(MediaResource* aResource,
   if (aIsMediaSource && aFrameEndTimeBeforeRecreateDemuxer) {
     mVideoFrameEndTimeBeforeReset = aFrameEndTimeBeforeRecreateDemuxer;
     WEBM_DEBUG("Set mVideoFrameEndTimeBeforeReset=%" PRId64,
-               mVideoFrameEndTimeBeforeReset);
+               mVideoFrameEndTimeBeforeReset.value());
   }
 }
 
@@ -648,7 +648,7 @@ WebMDemuxer::GetNextPacket(TrackInfo::TrackType aType, MediaRawDataQueue *aSampl
       next_tstamp += tstamp - mLastVideoFrameTime.refOr(0);
     } else if (mVideoFrameEndTimeBeforeReset) {
       WEBM_DEBUG("Setting next timestamp to be %" PRId64 " us",
-                 mVideoFrameEndTimeBeforeReset);
+                 mVideoFrameEndTimeBeforeReset.value());
       next_tstamp = mVideoFrameEndTimeBeforeReset.ref();
     } else {
       PushVideoPacket(holder);