oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

footage: set timebase too when merging image sequence params

Browse Source
This commit is contained in:
itsmattkc
2022-07-23 17:07:55 -07:00
parent b65d445145
commit d7748c4ace
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/project/footage/footage.cpp
+2 -1
View File
@@ -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;