chore(merge): resolve merge conflict in streamingDecoder.ts

Address merge conflict markers added during resolution of Windows export fixes, ensuring clean integration of decode termination logic updates.
2026-04-11 18:43:02 +01:00
parent e4d4ce284b d40f40d69d
commit 5caee9bc2d
4 changed files with 44 additions and 43 deletions
@@ -320,7 +320,6 @@ export default function VideoEditor() {
 		aspectRatio,
 		webcamLayoutPreset,
 		webcamMaskShape,
-		webcamSizePreset,
 		webcamPosition,
 		exportQuality,
 		exportFormat,
@@ -1313,7 +1313,6 @@ export default function TimelineEditor({
 		selectedBlurId,
 		selectedSpeedId,
 		annotationRegions,
-		blurRegions,
 		currentTime,
 		onSelectAnnotation,
 		keyShortcuts,