api/stream/types: specify subtitle format for containers other than mp4

wukko · wukko · commit b91c0c0013d3 · 2025-06-19T17:19:39.000+06:00
diff --git a/api/src/stream/types.js b/api/src/stream/types.js
@@ -128,7 +128,8 @@ const merge = async (streamInfo, res) => {
         if (streamInfo.subtitles) {
             args.push(
                 '-i', streamInfo.subtitles,
-                '-map', '2:s'
+                '-map', '2:s',
+                '-c:s', format === 'mp4' ? 'mov_text' : 'webvtt'
             );
         };
 
@@ -147,10 +148,6 @@ const merge = async (streamInfo, res) => {
             }
         }
 
-        if (streamInfo.subtitles && format === "mp4") {
-            args.push('-c:s', 'mov_text');
-        }
-
         if (streamInfo.metadata) {
             args = args.concat(convertMetadataToFFmpeg(streamInfo.metadata));
         }

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,8 @@ const merge = async (streamInfo, res) => {`
`128`	`128`	`if (streamInfo.subtitles) {`
`129`	`129`	`args.push(`
`130`	`130`	`'-i', streamInfo.subtitles,`
`131`		`- '-map', '2:s'`
	`131`	`+ '-map', '2:s',`
	`132`	`+ '-c:s', format === 'mp4' ? 'mov_text' : 'webvtt'`
`132`	`133`	`);`
`133`	`134`	`};`
`134`	`135`
`@@ -147,10 +148,6 @@ const merge = async (streamInfo, res) => {`
`147`	`148`	`}`
`148`	`149`	`}`
`149`	`150`
`150`		`- if (streamInfo.subtitles && format === "mp4") {`
`151`		`- args.push('-c:s', 'mov_text');`
`152`		`- }`
`153`		`-`
`154`	`151`	`if (streamInfo.metadata) {`
`155`	`152`	`args = args.concat(convertMetadataToFFmpeg(streamInfo.metadata));`
`156`	`153`	`}`