From d7748c4ace86684772ad44372b70ed350bd4a435 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 23 Jul 2022 17:07:55 -0700 Subject: [PATCH] footage: set timebase too when merging image sequence params --- app/node/project/footage/footage.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/node/project/footage/footage.cpp b/app/node/project/footage/footage.cpp index ebd410b6a..7b8870ee2 100644 --- a/app/node/project/footage/footage.cpp +++ b/app/node/project/footage/footage.cpp @@ -513,10 +513,11 @@ VideoParams Footage::MergeVideoStream(const VideoParams &base, const VideoParams merged.set_colorspace(over.colorspace()); merged.set_premultiplied_alpha(over.premultiplied_alpha()); merged.set_video_type(over.video_type()); - if (merged.video_type() == VideoParams::kVideoTypeImageSequence && over.video_type() == VideoParams::kVideoTypeImageSequence) { + if (merged.video_type() == VideoParams::kVideoTypeImageSequence) { merged.set_start_time(over.start_time()); merged.set_duration(over.duration()); merged.set_frame_rate(over.frame_rate()); + merged.set_time_base(over.time_base()); } return merged;