From f51deb19c60c518eaf69ffae89f34fc33c8e1e2f Mon Sep 17 00:00:00 2001
From: Rob Walch <rwalch@apple.com>
Date: Fri, 29 May 2026 14:37:30 -0700
Subject: [PATCH 1/2] Fix transmuxer worker error forwarding (missing
 instanceNo) Found testing #4958 with worker: "Containerless ec-3 is not
 supported"

---
 src/demux/transmuxer-worker.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/demux/transmuxer-worker.ts b/src/demux/transmuxer-worker.ts
index 53a9d131d7a..91af57de223 100644
--- a/src/demux/transmuxer-worker.ts
+++ b/src/demux/transmuxer-worker.ts
@@ -30,8 +30,12 @@ function startWorker() {
     if (data.cmd === 'init') {
       const config = JSON.parse(data.config);
       const observer = new EventEmitter();
-      observer.on(Events.FRAG_DECRYPTED, forwardMessage);
-      observer.on(Events.ERROR, forwardMessage);
+      observer.on(Events.FRAG_DECRYPTED, (event, data) =>
+        forwardMessage(event, data, instanceNo),
+      );
+      observer.on(Events.ERROR, (event, data) =>
+        forwardMessage(event, data, instanceNo),
+      );
       const logger = enableLogs(config.debug, data.id);
       forwardWorkerLogs(logger, instanceNo);
       transmuxers[instanceNo] = new Transmuxer(

From a1de060d94ebaa0486566d4ab200e8bb066fec1f Mon Sep 17 00:00:00 2001
From: Rob Walch <rwalch@apple.com>
Date: Fri, 29 May 2026 15:06:33 -0700
Subject: [PATCH 2/2] Add missing overserver teardown

---
 src/demux/transmuxer.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/demux/transmuxer.ts b/src/demux/transmuxer.ts
index bf88f7a6a34..2d1168e2a85 100644
--- a/src/demux/transmuxer.ts
+++ b/src/demux/transmuxer.ts
@@ -363,6 +363,9 @@ export default class Transmuxer {
       this.remuxer.destroy();
       this.remuxer = undefined;
     }
+    if (this.observer) {
+      this.observer.removeAllListeners();
+    }
     this.decryptionPromise = null;
     this.decrypter = this.observer = undefined;
     //@ts-ignore