Skip to content

Commit 8caa8eb

Browse files
authored
Merge branch 'main' into fix/mse-onDemand-safari-not-working
2 parents 212ef5b + d044183 commit 8caa8eb

File tree

4 files changed

+28
-24
lines changed

4 files changed

+28
-24
lines changed

examples/nextjs-with-typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@mux/mux-uploader-react": ">=1.0.0-beta.0",
2020
"@mux/mux-video": ">=0.3.0",
2121
"@mux/mux-video-react": ">=0.3.0",
22-
"media-chrome": "^4.16.1",
22+
"media-chrome": "^4.17.2",
2323
"next": "^14.2.2",
2424
"react": "^18.2.0",
2525
"react-dom": "^18.2.0",

package-lock.json

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/mux-player/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
"dependencies": {
128128
"@mux/mux-video": "0.29.1",
129129
"@mux/playback-core": "0.32.1",
130-
"media-chrome": "~4.16.1",
130+
"media-chrome": "~4.17.2",
131131
"player.style": "^0.3.0"
132132
},
133133
"devDependencies": {

packages/playback-core/src/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,10 @@ const MSE_SUPPORTED = Hls.isSupported?.();
368368
const shouldDefaultToMSE = (mediaEl: Pick<HTMLMediaElement, 'canPlayType'>) => isAndroidLike || !isSafari(mediaEl);
369369

370370
export const generatePlayerInitTime = () => {
371+
// bail during SSR to avoid triggering prerender errors
372+
// actual time will be generated during hydration
373+
if (typeof window === 'undefined') return undefined;
374+
371375
return mux.utils.now();
372376
};
373377

0 commit comments

Comments
 (0)