Skip to content

Commit 2f06573

Browse files
authored
Merge pull request #4891 from remotion-dev/compositor-dont-panic-on-last-position
`@remotion/compositor`: Fix a crash in Rust code
2 parents 06a00de + 753bc26 commit 2f06573

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

packages/compositor/rust/opened_stream.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ impl OpenedStream {
240240
one_frame_in_time_base,
241241
match freshly_seeked || self.last_position.is_none() {
242242
true => None,
243-
false => Some(self.last_position.unwrap()),
243+
false => Some(self.last_position.unwrap_or(0)),
244244
},
245245
tone_mapped,
246246
frame_cache_manager,
@@ -356,7 +356,7 @@ impl OpenedStream {
356356

357357
let previous_pts = match freshly_seeked || self.last_position.is_none() {
358358
true => None,
359-
false => Some(self.last_position.unwrap()),
359+
false => Some(self.last_position.unwrap_or(0)),
360360
};
361361
let item = FrameCacheItem {
362362
resolved_pts: unfiltered.pts().expect("expected pts"),

packages/compositor/rust/opened_video_manager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ impl OpenedVideoManager {
147147
stream_index,
148148
OpenStream {
149149
src: video.src.clone(),
150-
last_time: video.last_position.unwrap() as f64
150+
last_time: video.last_position.unwrap_or(0) as f64
151151
/ (video.time_base.1 as f64 / video.time_base.0 as f64),
152152
id: stream_index,
153153
transparent: video.transparent,

0 commit comments

Comments
 (0)